126 files changed, 1195 insertions, 1134 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7caf8ddea046..00bdfdbdd4a8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -49,7 +49,6 @@ config ARM
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_UID16
-        select VIRT_TO_BUS
         select KTIME_SCALAR
         select PERF_USE_VMALLOC
         select RTC_LIB
@@ -59,6 +58,7 @@ config ARM
         select CLONE_BACKWARDS
         select OLD_SIGSUSPEND3
         select OLD_SIGACTION
+        select HAVE_CONTEXT_TRACKING
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -743,6 +743,7 @@ config ARCH_RPC
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         select NO_IOPORT
+        select VIRT_TO_BUS
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -878,6 +879,7 @@ config ARCH_SHARK
         select ISA_DMA
         select NEED_MACH_MEMORY_H
         select PCI
+        select VIRT_TO_BUS
         select ZONE_DMA
         help
           Support for the StrongARM based Digital DNARD machine, also known
@@ -1005,12 +1007,12 @@ config ARCH_MULTI_V4_V5
         bool
 
 config ARCH_MULTI_V6
-        bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+        bool "ARMv6 based platforms (ARM11)"
         select ARCH_MULTI_V6_V7
         select CPU_V6
 
 config ARCH_MULTI_V7
-        bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+        bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
         default y
         select ARCH_MULTI_V6_V7
         select ARCH_VEXPRESS
@@ -1182,9 +1184,9 @@ config ARM_NR_BANKS
         default 8
 
 config IWMMXT
-        bool "Enable iWMMXt support"
+        bool "Enable iWMMXt support" if !CPU_PJ4
         depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
-        default y if PXA27x || PXA3xx || ARCH_MMP
+        default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
         help
           Enable support for iWMMXt context switching at run time if
           running on a CPU that supports it.
@@ -1438,6 +1440,16 @@ config ARM_ERRATA_775420
          to deadlock. This workaround puts DSB before executing ISB if
          an abort may occur on cache maintenance.
 
+config ARM_ERRATA_798181
+        bool "ARM errata: TLBI/DSB failure on Cortex-A15"
+        depends on CPU_V7 && SMP
+        help
+          On Cortex-A15 (r0p0..r3p2) the TLBI*IS/DSB operations are not
+          adequately shooting down all use of the old entries. This
+          option enables the Linux kernel workaround for this erratum
+          which sends an IPI to the CPUs that are running the same ASID
+          as the one being invalidated.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
@@ -1461,10 +1473,6 @@ config ISA_DMA
         bool
         select ISA_DMA_API
 
-config ARCH_NO_VIRT_TO_BUS
-        def_bool y
-        depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK
-
 # Select ISA DMA interface
 config ISA_DMA_API
         bool
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index ecfcdba2d17c..791fbeba40c6 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -495,6 +495,7 @@ config DEBUG_IMX_UART_PORT
                                                 DEBUG_IMX53_UART || \
                                                 DEBUG_IMX6Q_UART
         default 1
+        depends on ARCH_MXC
         help
           Choose UART port on which kernel low-level debug messages
           should be output.
@@ -601,6 +602,17 @@ config DEBUG_LL_INCLUDE
         default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
         default "mach/debug-macro.S"
 
+config DEBUG_UNCOMPRESS
+        bool
+        default y if ARCH_MULTIPLATFORM && DEBUG_LL && \
+                     !DEBUG_OMAP2PLUS_UART && \
+                     !DEBUG_TEGRA_UART
+
+config UNCOMPRESS_INCLUDE
+        string
+        default "debug/uncompress.h" if ARCH_MULTIPLATFORM
+        default "mach/uncompress.h"
+
 config EARLY_PRINTK
         bool "Early printk"
         depends on DEBUG_LL
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index afed28e37ea5..3580d57ea218 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -24,6 +24,9 @@ endif
 AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET)
 HEAD    = head.o
 OBJS    += misc.o decompress.o
+ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y)
+OBJS    += debug.o
+endif
 FONTC   = $(srctree)/drivers/video/console/font_acorn_8x8.c
 
 # string library code (-Os is enforced to keep it much smaller)
diff --git a/arch/arm/boot/compressed/debug.S b/arch/arm/boot/compressed/debug.S
new file mode 100644
index 000000000000..6e8382d5b7a4
--- /dev/null
+++ b/arch/arm/boot/compressed/debug.S
@@ -0,0 +1,12 @@
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+#include CONFIG_DEBUG_LL_INCLUDE
+
+ENTRY(putc)
+        addruart r1, r2, r3
+        waituart r3, r1
+        senduart r0, r1
+        busyuart r3, r1
+        mov      pc, lr
+ENDPROC(putc)
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index df899834d84e..31bd43b82095 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -25,13 +25,7 @@ unsigned int __machine_arch_type;
 static void putstr(const char *ptr);
 extern void error(char *x);
 
-#ifdef CONFIG_ARCH_MULTIPLATFORM
-static inline void putc(int c) {}
-static inline void flush(void) {}
-static inline void arch_decomp_setup(void) {}
-#else
-#include <mach/uncompress.h>
-#endif
+#include CONFIG_UNCOMPRESS_INCLUDE
 
 #ifdef CONFIG_DEBUG_ICEDCC
 
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index dd0c57dd9f30..3234875824dc 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -54,7 +54,7 @@
                 };
 
                 mvsdio@d00d4000 {
-                        pinctrl-0 = <&sdio_pins2>;
+                        pinctrl-0 = <&sdio_pins3>;
                         pinctrl-names = "default";
                         status = "okay";
                         /*
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 8188d138020e..a195debb67d3 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -59,6 +59,12 @@
                                              "mpp50", "mpp51", "mpp52";
                               marvell,function = "sd0";
                         };
+
+                        sdio_pins3: sdio-pins3 {
+                              marvell,pins = "mpp48", "mpp49", "mpp50",
+                                             "mpp51", "mpp52", "mpp53";
+                              marvell,function = "sd0";
+                        };
                 };
 
                 gpio0: gpio@d0018100 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index aa98e641931f..a98c0d50fbbe 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -238,8 +238,32 @@
                                 nand {
                                         pinctrl_nand: nand-0 {
                                                 atmel,pins =
-                                                        <3 4 0x0 0x1    /* PD5 gpio RDY pin pull_up */
-                                                         3 5 0x0 0x1>;  /* PD4 gpio enable pin pull_up */
+                                                        <3 0 0x1 0x0    /* PD0 periph A Read Enable */
+                                                         3 1 0x1 0x0    /* PD1 periph A Write Enable */
+                                                         3 2 0x1 0x0    /* PD2 periph A Address Latch Enable */
+                                                         3 3 0x1 0x0    /* PD3 periph A Command Latch Enable */
+                                                         3 4 0x0 0x1    /* PD4 gpio Chip Enable pin pull_up */
+                                                         3 5 0x0 0x1    /* PD5 gpio RDY/BUSY pin pull_up */
+                                                         3 6 0x1 0x0    /* PD6 periph A Data bit 0 */
+                                                         3 7 0x1 0x0    /* PD7 periph A Data bit 1 */
+                                                         3 8 0x1 0x0    /* PD8 periph A Data bit 2 */
+                                                         3 9 0x1 0x0    /* PD9 periph A Data bit 3 */
+                                                         3 10 0x1 0x0   /* PD10 periph A Data bit 4 */
+                                                         3 11 0x1 0x0   /* PD11 periph A Data bit 5 */
+                                                         3 12 0x1 0x0   /* PD12 periph A Data bit 6 */
+                                                         3 13 0x1 0x0>; /* PD13 periph A Data bit 7 */
+                                        };
+
+                                        pinctrl_nand_16bits: nand_16bits-0 {
+                                                atmel,pins =
+                                                        <3 14 0x1 0x0   /* PD14 periph A Data bit 8 */
+                                                         3 15 0x1 0x0   /* PD15 periph A Data bit 9 */
+                                                         3 16 0x1 0x0   /* PD16 periph A Data bit 10 */
+                                                         3 17 0x1 0x0   /* PD17 periph A Data bit 11 */
+                                                         3 18 0x1 0x0   /* PD18 periph A Data bit 12 */
+                                                         3 19 0x1 0x0   /* PD19 periph A Data bit 13 */
+                                                         3 20 0x1 0x0   /* PD20 periph A Data bit 14 */
+                                                         3 21 0x1 0x0>; /* PD21 periph A Data bit 15 */
                                         };
                                 };
 
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 9de93096601a..aaa63d0a8096 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -191,8 +191,8 @@
 
                 prcmu: prcmu@80157000 {
                         compatible = "stericsson,db8500-prcmu";
-                        reg = <0x80157000 0x1000>;
-                        reg-names = "prcmu";
+                        reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
+                        reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
                         interrupts = <0 47 0x4>;
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fceb5bc..1a62bcf18aa3 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -275,18 +275,27 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12680000 0x1000>;
                         interrupts = <0 35 0>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
                 };
 
                 pdma1: pdma@12690000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12690000 0x1000>;
                         interrupts = <0 36 0>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
                 };
 
                 mdma1: mdma@12850000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12850000 0x1000>;
                         interrupts = <0 34 0>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <1>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 5f3562ad6746..9a99755920c0 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -142,12 +142,18 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x120000 0x1000>;
                         interrupts = <0 34 0>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
                 };
 
                 pdma1: pdma@121B0000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x121000 0x1000>;
                         interrupts = <0 35 0>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 6ce3d17c3a29..fd36e1cca104 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -152,7 +152,6 @@
                         i2c0: i2c@80058000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&i2c0_pins_a>;
-                                clock-frequency = <400000>;
                                 status = "okay";
 
                                 sgtl5000: codec@0a {
diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
index e6cde8aa7fff..6c6a5442800a 100644
--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -70,7 +70,6 @@
                         i2c0: i2c@80058000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&i2c0_pins_a>;
-                                clock-frequency = <400000>;
                                 status = "okay";
 
                                 rtc: rtc@51 {
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 06ec460b4581..281a223591ff 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -91,6 +91,7 @@
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0x00a00600 0x20>;
                         interrupts = <1 13 0xf01>;
+                        clocks = <&clks 15>;
                 };
 
                 L2: l2-cache@00a02000 {
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index bd83b8fc7c83..c3573be7b92c 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -77,6 +77,7 @@
                 };
 
                 nand@3000000 {
+                        chip-delay = <40>;
                         status = "okay";
 
                         partition@0 {
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 93c3afbef9ee..3694e94f6e99 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -96,11 +96,11 @@
                                 marvell,function = "gpio";
                         };
                         pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 {
-                                marvell,pins = "mpp44";
+                                marvell,pins = "mpp46";
                                 marvell,function = "gpio";
                         };
                         pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 {
-                                marvell,pins = "mpp45";
+                                marvell,pins = "mpp47";
                                 marvell,function = "gpio";
                         };
 
@@ -157,14 +157,14 @@
                         gpios = <&gpio0 16 0>;
                         linux,default-trigger = "default-on";
                 };
-                health_led1 {
+                rebuild_led {
+                        label = "status:white:rebuild_led";
+                        gpios = <&gpio1 4 0>;
+                };
+                health_led {
                         label = "status:red:health_led";
                         gpios = <&gpio1 5 0>;
                 };
-                health_led2 {
-                        label = "status:white:health_led";
-                        gpios = <&gpio1 4 0>;
-                };
                 backup_led {
                         label = "status:blue:backup_led";
                         gpios = <&gpio0 15 0>;
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 8aad00f81ed9..f7bec3b1ba32 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -13,6 +13,9 @@
         compatible = "marvell,orion5x";
         interrupt-parent = <&intc>;
 
+        aliases {
+                gpio0 = &gpio0;
+        };
         intc: interrupt-controller {
                 compatible = "marvell,orion-intc", "marvell,intc";
                 interrupt-controller;
@@ -32,7 +35,9 @@
                         #gpio-cells = <2>;
                         gpio-controller;
                         reg = <0x10100 0x40>;
-                        ngpio = <32>;
+                        ngpios = <32>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                         interrupts = <6>, <7>, <8>, <9>;
                 };
 
@@ -91,7 +96,7 @@
                         reg = <0x90000 0x10000>,
                               <0xf2200000 0x800>;
                         reg-names = "regs", "sram";
-                        interrupts = <22>;
+                        interrupts = <28>;
                         status = "okay";
                 };
         };
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 48d00a099ce3..3d3f64d2111a 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -385,7 +385,7 @@
 
         spi@7000d800 {
                 compatible = "nvidia,tegra20-slink";
-                reg = <0x7000d480 0x200>;
+                reg = <0x7000d800 0x200>;
                 interrupts = <0 83 0x04>;
                 nvidia,dma-request-selector = <&apbdma 17>;
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 9d87a3ffe998..dbf46c272562 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -372,7 +372,7 @@
 
         spi@7000d800 {
                 compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink";
-                reg = <0x7000d480 0x200>;
+                reg = <0x7000d800 0x200>;
                 interrupts = <0 83 0x04>;
                 nvidia,dma-request-selector = <&apbdma 17>;
                 #address-cells = <1>;
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index c79f61faa3a5..da1c77d39327 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -243,6 +243,29 @@ typedef struct {
 
 #define ATOMIC64_INIT(i) { (i) }
 
+#ifdef CONFIG_ARM_LPAE
+static inline u64 atomic64_read(const atomic64_t *v)
+{
+        u64 result;
+
+        __asm__ __volatile__("@ atomic64_read\n"
+"       ldrd    %0, %H0, [%1]"
+        : "=&r" (result)
+        : "r" (&v->counter), "Qo" (v->counter)
+        );
+
+        return result;
+}
+
+static inline void atomic64_set(atomic64_t *v, u64 i)
+{
+        __asm__ __volatile__("@ atomic64_set\n"
+"       strd    %2, %H2, [%1]"
+        : "=Qo" (v->counter)
+        : "r" (&v->counter), "r" (i)
+        );
+}
+#else
 static inline u64 atomic64_read(const atomic64_t *v)
 {
         u64 result;
@@ -269,6 +292,7 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
         : "r" (&v->counter), "r" (i)
         : "cc");
 }
+#endif
 
 static inline void atomic64_add(u64 i, atomic64_t *v)
 {
diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h
index 720799fd3a81..dff714d886d5 100644
--- a/arch/arm/include/asm/delay.h
+++ b/arch/arm/include/asm/delay.h
@@ -24,7 +24,7 @@ extern struct arm_delay_ops {
         void (*delay)(unsigned long);
         void (*const_udelay)(unsigned long);
         void (*udelay)(unsigned long);
-        bool const_clock;
+        unsigned long ticks_per_jiffy;
 } arm_delay_ops;
 
 #define __delay(n)              arm_delay_ops.delay(n)
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index cca9f15704ed..ea289e1435e7 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -19,14 +19,6 @@
 #undef _CACHE
 #undef MULTI_CACHE
 
-#if defined(CONFIG_CPU_CACHE_V3)
-# ifdef _CACHE
-#  define MULTI_CACHE 1
-# else
-#  define _CACHE v3
-# endif
-#endif
-
 #if defined(CONFIG_CPU_CACHE_V4)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h
index 02fe2fbe2477..ed94b1a366ae 100644
--- a/arch/arm/include/asm/hardware/iop3xx.h
+++ b/arch/arm/include/asm/hardware/iop3xx.h
@@ -37,7 +37,7 @@ extern int iop3xx_get_init_atu(void);
  * IOP3XX processor registers
  */
 #define IOP3XX_PERIPHERAL_PHYS_BASE     0xffffe000
-#define IOP3XX_PERIPHERAL_VIRT_BASE     0xfeffe000
+#define IOP3XX_PERIPHERAL_VIRT_BASE     0xfedfe000
 #define IOP3XX_PERIPHERAL_SIZE          0x00002000
 #define IOP3XX_PERIPHERAL_UPPER_PA (IOP3XX_PERIPHERAL_PHYS_BASE +\
                                         IOP3XX_PERIPHERAL_SIZE - 1)
diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h
index 8c5e828f484d..91b99abe7a95 100644
--- a/arch/arm/include/asm/highmem.h
+++ b/arch/arm/include/asm/highmem.h
@@ -41,6 +41,13 @@ extern void kunmap_high(struct page *page);
 #endif
 #endif
 
+/*
+ * Needed to be able to broadcast the TLB invalidation for kmap.
+ */
+#ifdef CONFIG_ARM_ERRATA_798181
+#undef ARCH_NEEDS_KMAP_HIGH_GET
+#endif
+
 #ifdef ARCH_NEEDS_KMAP_HIGH_GET
 extern void *kmap_high_get(struct page *page);
 #else
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 5cf2e979b4be..7d2c3c843801 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -30,6 +30,11 @@ struct hw_pci {
         void            (*postinit)(void);
         u8              (*swizzle)(struct pci_dev *dev, u8 *pin);
         int             (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
+        resource_size_t (*align_resource)(struct pci_dev *dev,
+                                          const struct resource *res,
+                                          resource_size_t start,
+                                          resource_size_t size,
+                                          resource_size_t align);
 };
 
 /*
@@ -51,6 +56,12 @@ struct pci_sys_data {
         u8              (*swizzle)(struct pci_dev *, u8 *);
                                         /* IRQ mapping                          */
         int             (*map_irq)(const struct pci_dev *, u8, u8);
+                                        /* Resource alignement requirements     */
+        resource_size_t (*align_resource)(struct pci_dev *dev,
+                                          const struct resource *res,
+                                          resource_size_t start,
+                                          resource_size_t size,
+                                          resource_size_t align);
         void            *private_data;  /* platform controller private data     */
 };
 
diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h
index 863a6611323c..a7b85e0d0cc1 100644
--- a/arch/arm/include/asm/mmu_context.h
+++ b/arch/arm/include/asm/mmu_context.h
@@ -27,6 +27,8 @@ void __check_vmalloc_seq(struct mm_struct *mm);
 void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk);
 #define init_new_context(tsk,mm)        ({ atomic64_set(&mm->context.id, 0); 0; })
 
+DECLARE_PER_CPU(atomic64_t, active_asids);
+
 #else   /* !CONFIG_CPU_HAS_ASID */
 
 #ifdef CONFIG_MMU
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index 6ef8afd1b64c..86b8fe398b95 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -111,7 +111,7 @@
 #define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */
 #define L_PTE_S2_MT_WRITEBACK    (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */
 #define L_PTE_S2_RDONLY          (_AT(pteval_t, 1) << 6)   /* HAP[1]   */
-#define L_PTE_S2_RDWR            (_AT(pteval_t, 2) << 6)   /* HAP[2:1] */
+#define L_PTE_S2_RDWR            (_AT(pteval_t, 3) << 6)   /* HAP[2:1] */
 
 /*
  * Hyp-mode PL2 PTE definitions for LPAE.
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 80d6fc4dbe4a..9bcd262a9008 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -61,6 +61,15 @@ extern void __pgd_error(const char *file, int line, pgd_t);
 #define FIRST_USER_ADDRESS      PAGE_SIZE
 
 /*
+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and
+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd
+ * page shared between user and kernel).
+ */
+#ifdef CONFIG_ARM_LPAE
+#define USER_PGTABLES_CEILING   TASK_SIZE
+#endif
+
+/*
  * The pgprot_* and protection_map entries will be fixed up in runtime
  * to include the cachable and bufferable bits based on memory policy,
  * as well as any architecture dependent bits like global/ASID and SMP
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index cddda1f41f0f..1995d1a84060 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -152,6 +152,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
 #define TIF_SYSCALL_AUDIT       9
 #define TIF_SYSCALL_TRACEPOINT  10
 #define TIF_SECCOMP             11      /* seccomp syscall filtering active */
+#define TIF_NOHZ                12      /* in adaptive nohz mode */
 #define TIF_USING_IWMMXT        17
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     20
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
index 4db8c8820f0d..a3625d141c1d 100644
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
@@ -14,7 +14,6 @@
 
 #include <asm/glue.h>
 
-#define TLB_V3_PAGE     (1 << 0)
 #define TLB_V4_U_PAGE   (1 << 1)
 #define TLB_V4_D_PAGE   (1 << 2)
 #define TLB_V4_I_PAGE   (1 << 3)
@@ -22,7 +21,6 @@
 #define TLB_V6_D_PAGE   (1 << 5)
 #define TLB_V6_I_PAGE   (1 << 6)
 
-#define TLB_V3_FULL     (1 << 8)
 #define TLB_V4_U_FULL   (1 << 9)
 #define TLB_V4_D_FULL   (1 << 10)
 #define TLB_V4_I_FULL   (1 << 11)
@@ -52,7 +50,6 @@
  *      =============
  *
  *      We have the following to choose from:
- *        v3    - ARMv3
  *        v4    - ARMv4 without write buffer
  *        v4wb  - ARMv4 with write buffer without I TLB flush entry instruction
  *        v4wbi - ARMv4 with write buffer with I TLB flush entry instruction
@@ -169,7 +166,7 @@
 # define v6wbi_always_flags     (-1UL)
 #endif
 
-#define v7wbi_tlb_flags_smp     (TLB_WB | TLB_DCLEAN | TLB_BARRIER | \
+#define v7wbi_tlb_flags_smp     (TLB_WB | TLB_BARRIER | \
                                  TLB_V7_UIS_FULL | TLB_V7_UIS_PAGE | \
                                  TLB_V7_UIS_ASID | TLB_V7_UIS_BP)
 #define v7wbi_tlb_flags_up      (TLB_WB | TLB_DCLEAN | TLB_BARRIER | \
@@ -330,7 +327,6 @@ static inline void local_flush_tlb_all(void)
         if (tlb_flag(TLB_WB))
                 dsb();
 
-        tlb_op(TLB_V3_FULL, "c6, c0, 0", zero);
         tlb_op(TLB_V4_U_FULL | TLB_V6_U_FULL, "c8, c7, 0", zero);
         tlb_op(TLB_V4_D_FULL | TLB_V6_D_FULL, "c8, c6, 0", zero);
         tlb_op(TLB_V4_I_FULL | TLB_V6_I_FULL, "c8, c5, 0", zero);
@@ -351,9 +347,8 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
         if (tlb_flag(TLB_WB))
                 dsb();
 
-        if (possible_tlb_flags & (TLB_V3_FULL|TLB_V4_U_FULL|TLB_V4_D_FULL|TLB_V4_I_FULL)) {
+        if (possible_tlb_flags & (TLB_V4_U_FULL|TLB_V4_D_FULL|TLB_V4_I_FULL)) {
                 if (cpumask_test_cpu(get_cpu(), mm_cpumask(mm))) {
-                        tlb_op(TLB_V3_FULL, "c6, c0, 0", zero);
                         tlb_op(TLB_V4_U_FULL, "c8, c7, 0", zero);
                         tlb_op(TLB_V4_D_FULL, "c8, c6, 0", zero);
                         tlb_op(TLB_V4_I_FULL, "c8, c5, 0", zero);
@@ -385,9 +380,8 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
         if (tlb_flag(TLB_WB))
                 dsb();
 
-        if (possible_tlb_flags & (TLB_V3_PAGE|TLB_V4_U_PAGE|TLB_V4_D_PAGE|TLB_V4_I_PAGE|TLB_V4_I_FULL) &&
+        if (possible_tlb_flags & (TLB_V4_U_PAGE|TLB_V4_D_PAGE|TLB_V4_I_PAGE|TLB_V4_I_FULL) &&
             cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {
-                tlb_op(TLB_V3_PAGE, "c6, c0, 0", uaddr);
                 tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", uaddr);
                 tlb_op(TLB_V4_D_PAGE, "c8, c6, 1", uaddr);
                 tlb_op(TLB_V4_I_PAGE, "c8, c5, 1", uaddr);
@@ -418,7 +412,6 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
         if (tlb_flag(TLB_WB))
                 dsb();
 
-        tlb_op(TLB_V3_PAGE, "c6, c0, 0", kaddr);
         tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", kaddr);
         tlb_op(TLB_V4_D_PAGE, "c8, c6, 1", kaddr);
         tlb_op(TLB_V4_I_PAGE, "c8, c5, 1", kaddr);
@@ -450,6 +443,21 @@ static inline void local_flush_bp_all(void)
                 isb();
 }
 
+#ifdef CONFIG_ARM_ERRATA_798181
+static inline void dummy_flush_tlb_a15_erratum(void)
+{
+        /*
+         * Dummy TLBIMVAIS. Using the unmapped address 0 and ASID 0.
+         */
+        asm("mcr p15, 0, %0, c8, c3, 1" : : "r" (0));
+        dsb();
+}
+#else
+static inline void dummy_flush_tlb_a15_erratum(void)
+{
+}
+#endif
+
 /*
  *      flush_pmd_entry
  *
diff --git a/arch/arm/include/debug/uncompress.h b/arch/arm/include/debug/uncompress.h
new file mode 100644
index 000000000000..0e2949b0fae9
--- /dev/null
+++ b/arch/arm/include/debug/uncompress.h
@@ -0,0 +1,7 @@
+#ifdef CONFIG_DEBUG_UNCOMPRESS
+extern void putc(int c);
+#else
+static inline void putc(int c) {}
+#endif
+static inline void flush(void) {}
+static inline void arch_decomp_setup(void) {}
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index a1f73b502ef0..b2ed73c45489 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -462,6 +462,7 @@ static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head)
                 sys->busnr   = busnr;
                 sys->swizzle = hw->swizzle;
                 sys->map_irq = hw->map_irq;
+                sys->align_resource = hw->align_resource;
                 INIT_LIST_HEAD(&sys->resources);
 
                 if (hw->private_data)
@@ -574,6 +575,8 @@ char * __init pcibios_setup(char *str)
 resource_size_t pcibios_align_resource(void *data, const struct resource *res,
                                 resource_size_t size, resource_size_t align)
 {
+        struct pci_dev *dev = data;
+        struct pci_sys_data *sys = dev->sysdata;
         resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO && start & 0x300)
@@ -581,6 +584,9 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
 
         start = (start + align - 1) & ~(align - 1);
 
+        if (sys->align_resource)
+                return sys->align_resource(dev, res, start, size, align);
+
         return start;
 }
 
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 0f82098c9bfe..c66ca7e4ee91 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -192,18 +192,6 @@ __dabt_svc:
         svc_entry
         mov     r2, sp
         dabt_helper
-
-        @
-        @ IRQs off again before pulling preserved data off the stack
-        @
-        disable_irq_notrace
-
-#ifdef CONFIG_TRACE_IRQFLAGS
-        tst     r5, #PSR_I_BIT
-        bleq    trace_hardirqs_on
-        tst     r5, #PSR_I_BIT
-        blne    trace_hardirqs_off
-#endif
         svc_exit r5                             @ return from exception
  UNWIND(.fnend          )
 ENDPROC(__dabt_svc)
@@ -223,12 +211,7 @@ __irq_svc:
         blne    svc_preempt
 #endif
 
-#ifdef CONFIG_TRACE_IRQFLAGS
-        @ The parent context IRQs must have been enabled to get here in
-        @ the first place, so there's no point checking the PSR I bit.
-        bl      trace_hardirqs_on
-#endif
-        svc_exit r5                             @ return from exception
+        svc_exit r5, irq = 1                    @ return from exception
  UNWIND(.fnend          )
 ENDPROC(__irq_svc)
 
@@ -295,22 +278,8 @@ __und_svc_fault:
         mov     r0, sp                          @ struct pt_regs *regs
         bl      __und_fault
 
-        @
-        @ IRQs off again before pulling preserved data off the stack
-        @
 __und_svc_finish:
-        disable_irq_notrace
-
-        @
-        @ restore SPSR and restart the instruction
-        @
         ldr     r5, [sp, #S_PSR]                @ Get SVC cpsr
-#ifdef CONFIG_TRACE_IRQFLAGS
-        tst     r5, #PSR_I_BIT
-        bleq    trace_hardirqs_on
-        tst     r5, #PSR_I_BIT
-        blne    trace_hardirqs_off
-#endif
         svc_exit r5                             @ return from exception
  UNWIND(.fnend          )
 ENDPROC(__und_svc)
@@ -320,18 +289,6 @@ __pabt_svc:
         svc_entry
         mov     r2, sp                          @ regs
         pabt_helper
-
-        @
-        @ IRQs off again before pulling preserved data off the stack
-        @
-        disable_irq_notrace
-
-#ifdef CONFIG_TRACE_IRQFLAGS
-        tst     r5, #PSR_I_BIT
-        bleq    trace_hardirqs_on
-        tst     r5, #PSR_I_BIT
-        blne    trace_hardirqs_off
-#endif
         svc_exit r5                             @ return from exception
  UNWIND(.fnend          )
 ENDPROC(__pabt_svc)
@@ -396,6 +353,7 @@ ENDPROC(__pabt_svc)
 #ifdef CONFIG_IRQSOFF_TRACER
         bl      trace_hardirqs_off
 #endif
+        ct_user_exit save = 0
         .endm
 
         .macro  kuser_cmpxchg_check
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 3248cde504ed..bc5bc0a97131 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -35,12 +35,11 @@ ret_fast_syscall:
         ldr     r1, [tsk, #TI_FLAGS]
         tst     r1, #_TIF_WORK_MASK
         bne     fast_work_pending
-#if defined(CONFIG_IRQSOFF_TRACER)
         asm_trace_hardirqs_on
-#endif
 
         /* perform architecture specific actions before user return */
         arch_ret_to_user r1, lr
+        ct_user_enter
 
         restore_user_regs fast = 1, offset = S_OFF
  UNWIND(.fnend          )
@@ -71,11 +70,11 @@ ENTRY(ret_to_user_from_irq)
         tst     r1, #_TIF_WORK_MASK
         bne     work_pending
 no_work_pending:
-#if defined(CONFIG_IRQSOFF_TRACER)
         asm_trace_hardirqs_on
-#endif
+
         /* perform architecture specific actions before user return */
         arch_ret_to_user r1, lr
+        ct_user_enter save = 0
 
         restore_user_regs fast = 0, offset = 0
 ENDPROC(ret_to_user_from_irq)
@@ -276,7 +275,13 @@ ENDPROC(ftrace_graph_caller_old)
  */
 
 .macro mcount_enter
+/*
+ * This pad compensates for the push {lr} at the call site.  Note that we are
+ * unable to unwind through a function which does not otherwise save its lr.
+ */
+ UNWIND(.pad    #4)
         stmdb   sp!, {r0-r3, lr}
+ UNWIND(.save   {r0-r3, lr})
 .endm
 
 .macro mcount_get_lr reg
@@ -289,6 +294,7 @@ ENDPROC(ftrace_graph_caller_old)
 .endm
 
 ENTRY(__gnu_mcount_nc)
+UNWIND(.fnstart)
 #ifdef CONFIG_DYNAMIC_FTRACE
         mov     ip, lr
         ldmia   sp!, {lr}
@@ -296,17 +302,22 @@ ENTRY(__gnu_mcount_nc)
 #else
         __mcount
 #endif
+UNWIND(.fnend)
 ENDPROC(__gnu_mcount_nc)
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(ftrace_caller)
+UNWIND(.fnstart)
         __ftrace_caller
+UNWIND(.fnend)
 ENDPROC(ftrace_caller)
 #endif
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 ENTRY(ftrace_graph_caller)
+UNWIND(.fnstart)
         __ftrace_graph_caller
+UNWIND(.fnend)
 ENDPROC(ftrace_graph_caller)
 #endif
 
@@ -394,6 +405,7 @@ ENTRY(vector_swi)
         mcr     p15, 0, ip, c1, c0              @ update control register
 #endif
         enable_irq
+        ct_user_exit
 
         get_thread_info tsk
         adr     tbl, sys_call_table             @ load syscall table pointer
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 9a8531eadd3d..160f3376ba6d 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -74,7 +74,24 @@
         .endm
 
 #ifndef CONFIG_THUMB2_KERNEL
-        .macro  svc_exit, rpsr
+        .macro  svc_exit, rpsr, irq = 0
+        .if     \irq != 0
+        @ IRQs already off
+#ifdef CONFIG_TRACE_IRQFLAGS
+        @ The parent context IRQs must have been enabled to get here in
+        @ the first place, so there's no point checking the PSR I bit.
+        bl      trace_hardirqs_on
+#endif
+        .else
+        @ IRQs off again before pulling preserved data off the stack
+        disable_irq_notrace
+#ifdef CONFIG_TRACE_IRQFLAGS
+        tst     \rpsr, #PSR_I_BIT
+        bleq    trace_hardirqs_on
+        tst     \rpsr, #PSR_I_BIT
+        blne    trace_hardirqs_off
+#endif
+        .endif
         msr     spsr_cxsf, \rpsr
 #if defined(CONFIG_CPU_V6)
         ldr     r0, [sp]
@@ -120,7 +137,24 @@
         mov     pc, \reg
         .endm
 #else   /* CONFIG_THUMB2_KERNEL */
-        .macro  svc_exit, rpsr
+        .macro  svc_exit, rpsr, irq = 0
+        .if     \irq != 0
+        @ IRQs already off
+#ifdef CONFIG_TRACE_IRQFLAGS
+        @ The parent context IRQs must have been enabled to get here in
+        @ the first place, so there's no point checking the PSR I bit.
+        bl      trace_hardirqs_on
+#endif
+        .else
+        @ IRQs off again before pulling preserved data off the stack
+        disable_irq_notrace
+#ifdef CONFIG_TRACE_IRQFLAGS
+        tst     \rpsr, #PSR_I_BIT
+        bleq    trace_hardirqs_on
+        tst     \rpsr, #PSR_I_BIT
+        blne    trace_hardirqs_off
+#endif
+        .endif
         ldr     lr, [sp, #S_SP]                 @ top of the stack
         ldrd    r0, r1, [sp, #S_LR]             @ calling lr and pc
         clrex                                   @ clear the exclusive monitor
@@ -164,6 +198,34 @@
 #endif  /* !CONFIG_THUMB2_KERNEL */
 
 /*
+ * Context tracking subsystem.  Used to instrument transitions
+ * between user and kernel mode.
+ */
+        .macro ct_user_exit, save = 1
+#ifdef CONFIG_CONTEXT_TRACKING
+        .if     \save
+        stmdb   sp!, {r0-r3, ip, lr}
+        bl      user_exit
+        ldmia   sp!, {r0-r3, ip, lr}
+        .else
+        bl      user_exit
+        .endif
+#endif
+        .endm
+
+        .macro ct_user_enter, save = 1
+#ifdef CONFIG_CONTEXT_TRACKING
+        .if     \save
+        stmdb   sp!, {r0-r3, ip, lr}
+        bl      user_enter
+        ldmia   sp!, {r0-r3, ip, lr}
+        .else
+        bl      user_enter
+        .endif
+#endif
+        .endm
+
+/*
  * These are the registers used in the syscall handler, and allow us to
  * have in theory up to 7 arguments to a function - r0 to r6.
  *
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index e0eb9a1cae77..8bac553fe213 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -267,7 +267,7 @@ __create_page_tables:
         addne   r6, r6, #1 << SECTION_SHIFT
         strne   r6, [r3]
 
-#if defined(CONFIG_LPAE) && defined(CONFIG_CPU_ENDIAN_BE8)
+#if defined(CONFIG_ARM_LPAE) && defined(CONFIG_CPU_ENDIAN_BE8)
         sub     r4, r4, #4                      @ Fixup page table pointer
                                                 @ for 64-bit descriptors
 #endif
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 96093b75ab90..1fd749ee4a1b 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -966,7 +966,7 @@ static void reset_ctrl_regs(void *unused)
         }
 
         if (err) {
-                pr_warning("CPU %d debug is powered down!\n", cpu);
+                pr_warn_once("CPU %d debug is powered down!\n", cpu);
                 cpumask_or(&debug_err_mask, &debug_err_mask, cpumask_of(cpu));
                 return;
         }
@@ -987,7 +987,7 @@ clear_vcr:
         isb();
 
         if (cpumask_intersects(&debug_err_mask, cpumask_of(cpu))) {
-                pr_warning("CPU %d failed to disable vector catch\n", cpu);
+                pr_warn_once("CPU %d failed to disable vector catch\n", cpu);
                 return;
         }
 
@@ -1007,7 +1007,7 @@ clear_vcr:
         }
 
         if (cpumask_intersects(&debug_err_mask, cpumask_of(cpu))) {
-                pr_warning("CPU %d failed to clear debug register pairs\n", cpu);
+                pr_warn_once("CPU %d failed to clear debug register pairs\n", cpu);
                 return;
         }
 
@@ -1043,7 +1043,7 @@ static int dbg_cpu_pm_notify(struct notifier_block *self, unsigned long action,
         return NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata dbg_cpu_pm_nb = {
+static struct notifier_block dbg_cpu_pm_nb = {
         .notifier_call = dbg_cpu_pm_notify,
 };
 
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 146157dfe27c..8c3094d0f7b7 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -253,7 +253,10 @@ validate_event(struct pmu_hw_events *hw_events,
         struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
         struct pmu *leader_pmu = event->group_leader->pmu;
 
-        if (event->pmu != leader_pmu || event->state <= PERF_EVENT_STATE_OFF)
+        if (event->pmu != leader_pmu || event->state < PERF_EVENT_STATE_OFF)
+                return 1;
+
+        if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)
                 return 1;
 
         return armpmu->get_event_idx(hw_events, event) >= 0;
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index 8085417555dd..fafedd86885d 100644
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -26,7 +26,7 @@ static int save_return_addr(struct stackframe *frame, void *d)
         struct return_address_data *data = d;
 
         if (!data->level) {
-                data->addr = (void *)frame->lr;
+                data->addr = (void *)frame->pc;
 
                 return 1;
         } else {
@@ -41,7 +41,8 @@ void *return_address(unsigned int level)
         struct stackframe frame;
         register unsigned long current_sp asm ("sp");
 
-        data.level = level + 1;
+        data.level = level + 2;
+        data.addr = NULL;
 
         frame.fp = (unsigned long)__builtin_frame_address(0);
         frame.sp = current_sp;
diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c
index bd6f56b9ec21..59d2adb764a9 100644
--- a/arch/arm/kernel/sched_clock.c
+++ b/arch/arm/kernel/sched_clock.c
@@ -45,12 +45,12 @@ static u32 notrace jiffy_sched_clock_read(void)
 
 static u32 __read_mostly (*read_sched_clock)(void) = jiffy_sched_clock_read;
 
-static inline u64 cyc_to_ns(u64 cyc, u32 mult, u32 shift)
+static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
 {
         return (cyc * mult) >> shift;
 }
 
-static unsigned long long cyc_to_sched_clock(u32 cyc, u32 mask)
+static unsigned long long notrace cyc_to_sched_clock(u32 cyc, u32 mask)
 {
         u64 epoch_ns;
         u32 epoch_cyc;
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1cc9e1796415..728007c4a2b7 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -56,7 +56,6 @@
 #include <asm/virt.h>
 
 #include "atags.h"
-#include "tcm.h"
 
 
 #if defined(CONFIG_FPE_NWFPE) || defined(CONFIG_FPE_FASTFPE)
@@ -353,6 +352,23 @@ void __init early_print(const char *str, ...)
         printk("%s", buf);
 }
 
+static void __init cpuid_init_hwcaps(void)
+{
+        unsigned int divide_instrs;
+
+        if (cpu_architecture() < CPU_ARCH_ARMv7)
+                return;
+
+        divide_instrs = (read_cpuid_ext(CPUID_EXT_ISAR0) & 0x0f000000) >> 24;
+
+        switch (divide_instrs) {
+        case 2:
+                elf_hwcap |= HWCAP_IDIVA;
+        case 1:
+                elf_hwcap |= HWCAP_IDIVT;
+        }
+}
+
 static void __init feat_v6_fixup(void)
 {
         int id = read_cpuid_id();
@@ -373,7 +389,7 @@ static void __init feat_v6_fixup(void)
  *
  * cpu_init sets up the per-CPU stacks.
  */
-void cpu_init(void)
+void notrace cpu_init(void)
 {
         unsigned int cpu = smp_processor_id();
         struct stack *stk = &stacks[cpu];
@@ -483,8 +499,11 @@ static void __init setup_processor(void)
         snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c",
                  list->elf_name, ENDIANNESS);
         elf_hwcap = list->elf_hwcap;
+
+        cpuid_init_hwcaps();
+
 #ifndef CONFIG_ARM_THUMB
-        elf_hwcap &= ~HWCAP_THUMB;
+        elf_hwcap &= ~(HWCAP_THUMB | HWCAP_IDIVT);
 #endif
 
         feat_v6_fixup();
@@ -524,7 +543,7 @@ int __init arm_add_memory(phys_addr_t start, phys_addr_t size)
         size -= start & ~PAGE_MASK;
         bank->start = PAGE_ALIGN(start);
 
-#ifndef CONFIG_LPAE
+#ifndef CONFIG_ARM_LPAE
         if (bank->start + size < bank->start) {
                 printk(KERN_CRIT "Truncating memory at 0x%08llx to fit in "
                         "32-bit physical address space\n", (long long)start);
@@ -778,8 +797,6 @@ void __init setup_arch(char **cmdline_p)
 
         reserve_crashkernel();
 
-        tcm_init();
-
 #ifdef CONFIG_MULTI_IRQ_HANDLER
         handle_arch_irq = mdesc->handle_irq;
 #endif
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 79078edbb9bc..4231034b8128 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -211,6 +211,13 @@ void __cpuinit __cpu_die(unsigned int cpu)
         }
         printk(KERN_NOTICE "CPU%u: shutdown\n", cpu);
 
+        /*
+         * platform_cpu_kill() is generally expected to do the powering off
+         * and/or cutting of clocks to the dying CPU.  Optionally, this may
+         * be done by the CPU which is dying in preference to supporting
+         * this call, but that means there is _no_ synchronisation between
+         * the requesting CPU and the dying CPU actually losing power.
+         */
         if (!platform_cpu_kill(cpu))
                 printk("CPU%u: unable to kill\n", cpu);
 }
@@ -230,14 +237,41 @@ void __ref cpu_die(void)
         idle_task_exit();
 
         local_irq_disable();
-        mb();
 
-        /* Tell __cpu_die() that this CPU is now safe to dispose of */
+        /*
+         * Flush the data out of the L1 cache for this CPU.  This must be
+         * before the completion to ensure that data is safely written out
+         * before platform_cpu_kill() gets called - which may disable
+         * *this* CPU and power down its cache.
+         */
+        flush_cache_louis();
+
+        /*
+         * Tell __cpu_die() that this CPU is now safe to dispose of.  Once
+         * this returns, power and/or clocks can be removed at any point
+         * from this CPU and its cache by platform_cpu_kill().
+         */
         RCU_NONIDLE(complete(&cpu_died));
 
         /*
-         * actual CPU shutdown procedure is at least platform (if not
-         * CPU) specific.
+         * Ensure that the cache lines associated with that completion are
+         * written out.  This covers the case where _this_ CPU is doing the
+         * powering down, to ensure that the completion is visible to the
+         * CPU waiting for this one.
+         */
+        flush_cache_louis();
+
+        /*
+         * The actual CPU shutdown procedure is at least platform (if not
+         * CPU) specific.  This may remove power, or it may simply spin.
+         *
+         * Platforms are generally expected *NOT* to return from this call,
+         * although there are some which do because they have no way to
+         * power down the CPU.  These platforms are the _only_ reason we
+         * have a return path which uses the fragment of assembly below.
+         *
+         * The return path should not be used for platforms which can
+         * power off the CPU.
          */
         if (smp_ops.cpu_die)
                 smp_ops.cpu_die(cpu);
@@ -673,9 +707,6 @@ static int cpufreq_callback(struct notifier_block *nb,
         if (freq->flags & CPUFREQ_CONST_LOOPS)
                 return NOTIFY_OK;
 
-        if (arm_delay_ops.const_clock)
-                return NOTIFY_OK;
-
         if (!per_cpu(l_p_j_ref, cpu)) {
                 per_cpu(l_p_j_ref, cpu) =
                         per_cpu(cpu_data, cpu).loops_per_jiffy;
diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c
index bd0300531399..9a52a07aa40e 100644
--- a/arch/arm/kernel/smp_tlb.c
+++ b/arch/arm/kernel/smp_tlb.c
@@ -12,6 +12,7 @@
 
 #include <asm/smp_plat.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
 
 /**********************************************************************/
 
@@ -69,12 +70,73 @@ static inline void ipi_flush_bp_all(void *ignored)
         local_flush_bp_all();
 }
 
+#ifdef CONFIG_ARM_ERRATA_798181
+static int erratum_a15_798181(void)
+{
+        unsigned int midr = read_cpuid_id();
+
+        /* Cortex-A15 r0p0..r3p2 affected */
+        if ((midr & 0xff0ffff0) != 0x410fc0f0 || midr > 0x413fc0f2)
+                return 0;
+        return 1;
+}
+#else
+static int erratum_a15_798181(void)
+{
+        return 0;
+}
+#endif
+
+static void ipi_flush_tlb_a15_erratum(void *arg)
+{
+        dmb();
+}
+
+static void broadcast_tlb_a15_erratum(void)
+{
+        if (!erratum_a15_798181())
+                return;
+
+        dummy_flush_tlb_a15_erratum();
+        smp_call_function(ipi_flush_tlb_a15_erratum, NULL, 1);
+}
+
+static void broadcast_tlb_mm_a15_erratum(struct mm_struct *mm)
+{
+        int cpu, this_cpu;
+        cpumask_t mask = { CPU_BITS_NONE };
+
+        if (!erratum_a15_798181())
+                return;
+
+        dummy_flush_tlb_a15_erratum();
+        this_cpu = get_cpu();
+        for_each_online_cpu(cpu) {
+                if (cpu == this_cpu)
+                        continue;
+                /*
+                 * We only need to send an IPI if the other CPUs are running
+                 * the same ASID as the one being invalidated. There is no
+                 * need for locking around the active_asids check since the
+                 * switch_mm() function has at least one dmb() (as required by
+                 * this workaround) in case a context switch happens on
+                 * another CPU after the condition below.
+                 */
+                if (atomic64_read(&mm->context.id) ==
+                    atomic64_read(&per_cpu(active_asids, cpu)))
+                        cpumask_set_cpu(cpu, &mask);
+        }
+        smp_call_function_many(&mask, ipi_flush_tlb_a15_erratum, NULL, 1);
+        put_cpu();
+}
+
 void flush_tlb_all(void)
 {
         if (tlb_ops_need_broadcast())
                 on_each_cpu(ipi_flush_tlb_all, NULL, 1);
         else
                 local_flush_tlb_all();
+        broadcast_tlb_a15_erratum();
 }
 
 void flush_tlb_mm(struct mm_struct *mm)
@@ -83,6 +145,7 @@ void flush_tlb_mm(struct mm_struct *mm)
                 on_each_cpu_mask(mm_cpumask(mm), ipi_flush_tlb_mm, mm, 1);
         else
                 local_flush_tlb_mm(mm);
+        broadcast_tlb_mm_a15_erratum(mm);
 }
 
 void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
@@ -95,6 +158,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
                                         &ta, 1);
         } else
                 local_flush_tlb_page(vma, uaddr);
+        broadcast_tlb_mm_a15_erratum(vma->vm_mm);
 }
 
 void flush_tlb_kernel_page(unsigned long kaddr)
@@ -105,6 +169,7 @@ void flush_tlb_kernel_page(unsigned long kaddr)
                 on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1);
         } else
                 local_flush_tlb_kernel_page(kaddr);
+        broadcast_tlb_a15_erratum();
 }
 
 void flush_tlb_range(struct vm_area_struct *vma,
@@ -119,6 +184,7 @@ void flush_tlb_range(struct vm_area_struct *vma,
                                         &ta, 1);
         } else
                 local_flush_tlb_range(vma, start, end);
+        broadcast_tlb_mm_a15_erratum(vma->vm_mm);
 }
 
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
@@ -130,6 +196,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
                 on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1);
         } else
                 local_flush_tlb_kernel_range(start, end);
+        broadcast_tlb_a15_erratum();
 }
 
 void flush_bp_all(void)
diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
index 30ae6bb4a310..f50f19e5c138 100644
--- a/arch/arm/kernel/tcm.c
+++ b/arch/arm/kernel/tcm.c
@@ -17,7 +17,6 @@
 #include <asm/mach/map.h>
 #include <asm/memory.h>
 #include <asm/system_info.h>
-#include "tcm.h"
 
 static struct gen_pool *tcm_pool;
 static bool dtcm_present;
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c10a45fa73f7..a0dfc2a53f91 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -198,6 +198,7 @@ int kvm_dev_ioctl_check_extension(long ext)
                 break;
         case KVM_CAP_ARM_SET_DEVICE_ADDR:
                 r = 1;
+                break;
         case KVM_CAP_NR_VCPUS:
                 r = num_online_cpus();
                 break;
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 94eee8befc83..8eea97be1ed5 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -79,11 +79,11 @@ static bool access_dcsw(struct kvm_vcpu *vcpu,
         unsigned long val;
         int cpu;
 
-        cpu = get_cpu();
-
         if (!p->is_write)
                 return read_from_write_only(vcpu, p);
 
+        cpu = get_cpu();
+
         cpumask_setall(&vcpu->arch.require_dcache_flush);
         cpumask_clear_cpu(cpu, &vcpu->arch.require_dcache_flush);
 
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c
index 161d5c15f0f0..17c5ac7d10ed 100644
--- a/arch/arm/kvm/vgic.c
+++ b/arch/arm/kvm/vgic.c
@@ -883,8 +883,7 @@ static bool vgic_queue_irq(struct kvm_vcpu *vcpu, u8 sgi_source_id, int irq)
                           lr, irq, vgic_cpu->vgic_lr[lr]);
                 BUG_ON(!test_bit(lr, vgic_cpu->lr_used));
                 vgic_cpu->vgic_lr[lr] |= GICH_LR_PENDING_BIT;
-
-                goto out;
+                return true;
         }
 
         /* Try to use another LR for this interrupt */
@@ -898,7 +897,6 @@ static bool vgic_queue_irq(struct kvm_vcpu *vcpu, u8 sgi_source_id, int irq)
         vgic_cpu->vgic_irq_lr_map[irq] = lr;
         set_bit(lr, vgic_cpu->lr_used);
 
-out:
         if (!vgic_irq_is_edge(vcpu, irq))
                 vgic_cpu->vgic_lr[lr] |= GICH_LR_EOI;
 
@@ -1018,21 +1016,6 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
 
         kvm_debug("MISR = %08x\n", vgic_cpu->vgic_misr);
 
-        /*
-         * We do not need to take the distributor lock here, since the only
-         * action we perform is clearing the irq_active_bit for an EOIed
-         * level interrupt.  There is a potential race with
-         * the queuing of an interrupt in __kvm_vgic_flush_hwstate(), where we
-         * check if the interrupt is already active. Two possibilities:
-         *
-         * - The queuing is occurring on the same vcpu: cannot happen,
-         *   as we're already in the context of this vcpu, and
-         *   executing the handler
-         * - The interrupt has been migrated to another vcpu, and we
-         *   ignore this interrupt for this run. Big deal. It is still
-         *   pending though, and will get considered when this vcpu
-         *   exits.
-         */
         if (vgic_cpu->vgic_misr & GICH_MISR_EOI) {
                 /*
                  * Some level interrupts have been EOIed. Clear their
@@ -1054,6 +1037,13 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
                         } else {
                                 vgic_cpu_irq_clear(vcpu, irq);
                         }
+
+                        /*
+                         * Despite being EOIed, the LR may not have
+                         * been marked as empty.
+                         */
+                        set_bit(lr, (unsigned long *)vgic_cpu->vgic_elrsr);
+                        vgic_cpu->vgic_lr[lr] &= ~GICH_LR_ACTIVE_BIT;
                 }
         }
 
@@ -1064,9 +1054,8 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
 }
 
 /*
- * Sync back the VGIC state after a guest run. We do not really touch
- * the distributor here (the irq_pending_on_cpu bit is safe to set),
- * so there is no need for taking its lock.
+ * Sync back the VGIC state after a guest run. The distributor lock is
+ * needed so we don't get preempted in the middle of the state processing.
  */
 static void __kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)
 {
@@ -1112,10 +1101,14 @@ void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)
 
 void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)
 {
+        struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
+
         if (!irqchip_in_kernel(vcpu->kvm))
                 return;
 
+        spin_lock(&dist->lock);
         __kvm_vgic_sync_hwstate(vcpu);
+        spin_unlock(&dist->lock);
 }
 
 int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu)
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 6b93f6a1a3c7..64dbfa57204a 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -58,7 +58,7 @@ static void __timer_delay(unsigned long cycles)
 static void __timer_const_udelay(unsigned long xloops)
 {
         unsigned long long loops = xloops;
-        loops *= loops_per_jiffy;
+        loops *= arm_delay_ops.ticks_per_jiffy;
         __timer_delay(loops >> UDELAY_SHIFT);
 }
 
@@ -73,11 +73,13 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
                 pr_info("Switching to timer-based delay loop\n");
                 delay_timer                     = timer;
                 lpj_fine                        = timer->freq / HZ;
-                loops_per_jiffy                 = lpj_fine;
+
+                /* cpufreq may scale loops_per_jiffy, so keep a private copy */
+                arm_delay_ops.ticks_per_jiffy   = lpj_fine;
                 arm_delay_ops.delay             = __timer_delay;
                 arm_delay_ops.const_udelay      = __timer_const_udelay;
                 arm_delay_ops.udelay            = __timer_udelay;
-                arm_delay_ops.const_clock       = true;
+
                 delay_calibrated                = true;
         } else {
                 pr_info("Ignoring duplicate/late registration of read_current_timer delay\n");
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index eed465ab0dd7..5fc23771c154 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -209,6 +209,14 @@ extern int at91_get_gpio_value(unsigned pin);
 extern void at91_gpio_suspend(void);
 extern void at91_gpio_resume(void);
 
+#ifdef CONFIG_PINCTRL_AT91
+extern void at91_pinctrl_gpio_suspend(void);
+extern void at91_pinctrl_gpio_resume(void);
+#else
+static inline void at91_pinctrl_gpio_suspend(void) {}
+static inline void at91_pinctrl_gpio_resume(void) {}
+#endif
+
 #endif  /* __ASSEMBLY__ */
 
 #endif
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c
index 8e210262aeee..e0ca59171022 100644
--- a/arch/arm/mach-at91/irq.c
+++ b/arch/arm/mach-at91/irq.c
@@ -92,23 +92,21 @@ static int at91_aic_set_wake(struct irq_data *d, unsigned value)
 
 void at91_irq_suspend(void)
 {
-        int i = 0, bit;
+        int bit = -1;
 
         if (has_aic5()) {
                 /* disable enabled irqs */
-                while ((bit = find_next_bit(backups, n_irqs, i)) < n_irqs) {
+                while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) {
                         at91_aic_write(AT91_AIC5_SSR,
                                        bit & AT91_AIC5_INTSEL_MSK);
                         at91_aic_write(AT91_AIC5_IDCR, 1);
-                        i = bit;
                 }
                 /* enable wakeup irqs */
-                i = 0;
-                while ((bit = find_next_bit(wakeups, n_irqs, i)) < n_irqs) {
+                bit = -1;
+                while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) {
                         at91_aic_write(AT91_AIC5_SSR,
                                        bit & AT91_AIC5_INTSEL_MSK);
                         at91_aic_write(AT91_AIC5_IECR, 1);
-                        i = bit;
                 }
         } else {
                 at91_aic_write(AT91_AIC_IDCR, *backups);
@@ -118,23 +116,21 @@ void at91_irq_suspend(void)
 
 void at91_irq_resume(void)
 {
-        int i = 0, bit;
+        int bit = -1;
 
         if (has_aic5()) {
                 /* disable wakeup irqs */
-                while ((bit = find_next_bit(wakeups, n_irqs, i)) < n_irqs) {
+                while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) {
                         at91_aic_write(AT91_AIC5_SSR,
                                        bit & AT91_AIC5_INTSEL_MSK);
                         at91_aic_write(AT91_AIC5_IDCR, 1);
-                        i = bit;
                 }
                 /* enable irqs disabled for suspend */
-                i = 0;
-                while ((bit = find_next_bit(backups, n_irqs, i)) < n_irqs) {
+                bit = -1;
+                while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) {
                         at91_aic_write(AT91_AIC5_SSR,
                                        bit & AT91_AIC5_INTSEL_MSK);
                         at91_aic_write(AT91_AIC5_IECR, 1);
-                        i = bit;
                 }
         } else {
                 at91_aic_write(AT91_AIC_IDCR, *wakeups);
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index adb6db888a1f..73f1f250403a 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -201,7 +201,10 @@ extern u32 at91_slow_clock_sz;
 
 static int at91_pm_enter(suspend_state_t state)
 {
-        at91_gpio_suspend();
+        if (of_have_populated_dt())
+                at91_pinctrl_gpio_suspend();
+        else
+                at91_gpio_suspend();
         at91_irq_suspend();
 
         pr_debug("AT91: PM - wake mask %08x, pm state %d\n",
@@ -286,7 +289,10 @@ static int at91_pm_enter(suspend_state_t state)
 error:
         target_state = PM_SUSPEND_ON;
         at91_irq_resume();
-        at91_gpio_resume();
+        if (of_have_populated_dt())
+                at91_pinctrl_gpio_resume();
+        else
+                at91_gpio_resume();
         return 0;
 }
 
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index e698f26cc0cb..52e4bb5cf12d 100644
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -22,19 +22,9 @@
 
 static struct map_desc cns3xxx_io_desc[] __initdata = {
         {
-                .virtual        = CNS3XXX_TC11MP_TWD_BASE_VIRT,
-                .pfn            = __phys_to_pfn(CNS3XXX_TC11MP_TWD_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT,
-                .pfn            = __phys_to_pfn(CNS3XXX_TC11MP_GIC_CPU_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT,
-                .pfn            = __phys_to_pfn(CNS3XXX_TC11MP_GIC_DIST_BASE),
-                .length         = SZ_4K,
+                .virtual        = CNS3XXX_TC11MP_SCU_BASE_VIRT,
+                .pfn            = __phys_to_pfn(CNS3XXX_TC11MP_SCU_BASE),
+                .length         = SZ_8K,
                 .type           = MT_DEVICE,
         }, {
                 .virtual        = CNS3XXX_TIMER1_2_3_BASE_VIRT,
diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
index 191c8e57f289..b1021aafa481 100644
--- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
+++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
@@ -94,10 +94,10 @@
 #define RTC_INTR_STS_OFFSET                     0x34
 
 #define CNS3XXX_MISC_BASE                       0x76000000      /* Misc Control */
-#define CNS3XXX_MISC_BASE_VIRT                  0xFFF07000      /* Misc Control */
+#define CNS3XXX_MISC_BASE_VIRT                  0xFB000000      /* Misc Control */
 
 #define CNS3XXX_PM_BASE                         0x77000000      /* Power Management Control */
-#define CNS3XXX_PM_BASE_VIRT                    0xFFF08000
+#define CNS3XXX_PM_BASE_VIRT                    0xFB001000
 
 #define PM_CLK_GATE_OFFSET                      0x00
 #define PM_SOFT_RST_OFFSET                      0x04
@@ -109,7 +109,7 @@
 #define PM_PLL_HM_PD_OFFSET                     0x1C
 
 #define CNS3XXX_UART0_BASE                      0x78000000      /* UART 0 */
-#define CNS3XXX_UART0_BASE_VIRT                 0xFFF09000
+#define CNS3XXX_UART0_BASE_VIRT                 0xFB002000
 
 #define CNS3XXX_UART1_BASE                      0x78400000      /* UART 1 */
 #define CNS3XXX_UART1_BASE_VIRT                 0xFFF0A000
@@ -130,7 +130,7 @@
 #define CNS3XXX_I2S_BASE_VIRT                   0xFFF10000
 
 #define CNS3XXX_TIMER1_2_3_BASE                 0x7C800000      /* Timer */
-#define CNS3XXX_TIMER1_2_3_BASE_VIRT            0xFFF10800
+#define CNS3XXX_TIMER1_2_3_BASE_VIRT            0xFB003000
 
 #define TIMER1_COUNTER_OFFSET                   0x00
 #define TIMER1_AUTO_RELOAD_OFFSET               0x04
@@ -227,16 +227,16 @@
  * Testchip peripheral and fpga gic regions
  */
 #define CNS3XXX_TC11MP_SCU_BASE                 0x90000000      /* IRQ, Test chip */
-#define CNS3XXX_TC11MP_SCU_BASE_VIRT            0xFF000000
+#define CNS3XXX_TC11MP_SCU_BASE_VIRT            0xFB004000
 
 #define CNS3XXX_TC11MP_GIC_CPU_BASE             0x90000100      /* Test chip interrupt controller CPU interface */
-#define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT        0xFF000100
+#define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT        (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x100)
 
 #define CNS3XXX_TC11MP_TWD_BASE                 0x90000600
-#define CNS3XXX_TC11MP_TWD_BASE_VIRT            0xFF000600
+#define CNS3XXX_TC11MP_TWD_BASE_VIRT            (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x600)
 
 #define CNS3XXX_TC11MP_GIC_DIST_BASE            0x90001000      /* Test chip interrupt controller distributor */
-#define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT       0xFF001000
+#define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT       (CNS3XXX_TC11MP_SCU_BASE_VIRT + 0x1000)
 
 #define CNS3XXX_TC11MP_L220_BASE                0x92002000      /* L220 registers */
 #define CNS3XXX_TC11MP_L220_BASE_VIRT           0xFF002000
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index a685e9706b7b..45b7c71d9cc1 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel);
  */
 int edma_alloc_slot(unsigned ctlr, int slot)
 {
+        if (!edma_cc[ctlr])
+                return -EINVAL;
+
         if (slot >= 0)
                 slot = EDMA_CHAN_SLOT(slot);
 
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h
index d2afb4dd82ab..b5cc77d2380b 100644
--- a/arch/arm/mach-ep93xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h
@@ -47,9 +47,13 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
 
 static inline void putc(int c)
 {
-        /* Transmit fifo not full?  */
-        while (__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF)
-                ;
+        int i;
+
+        for (i = 0; i < 10000; i++) {
+                /* Transmit fifo not full? */
+                if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF))
+                        break;
+        }
 
         __raw_writeb(c, PHYS_UART_DATA);
 }
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index c3f825b27947..af90cfa2f826 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -28,7 +28,6 @@ static inline void cpu_enter_lowpower_a9(void)
 {
         unsigned int v;
 
-        flush_cache_all();
         asm volatile(
         "       mcr     p15, 0, %1, c7, c5, 0\n"
         "       mcr     p15, 0, %1, c7, c10, 4\n"
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index abda5a18a664..0f2111a11315 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -67,6 +67,7 @@ config ARCH_NETWINDER
         select ISA
         select ISA_DMA
         select PCI
+        select VIRT_TO_BUS
         help
           Say Y here if you intend to run this kernel on the Rebel.COM
           NetWinder.  Information about this machine can be found at:
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index f30c52843396..a019e4e86e51 100644
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -14,7 +14,6 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
-
 #include <asm/cacheflush.h>
 
 #include "core.h"
@@ -28,13 +27,11 @@ extern void secondary_startup(void);
  */
 void __ref highbank_cpu_die(unsigned int cpu)
 {
-        flush_cache_all();
-
         highbank_set_cpu_jump(cpu, phys_to_virt(0));
-        highbank_set_core_pwr();
 
-        cpu_do_idle();
+        flush_cache_louis();
+        highbank_set_core_pwr();
 
-        /* We should never return from idle */
-        panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
+        while (1)
+                cpu_do_idle();
 }
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c
index 74e3a34d78b8..2193c834f55c 100644
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@ -257,6 +257,7 @@ int __init mx35_clocks_init(void)
         clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");
         clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0");
         clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");
+        clk_register_clkdev(clk[admux_gate], "audmux", NULL);
 
         clk_prepare_enable(clk[spba_gate]);
         clk_prepare_enable(clk[gpio1_gate]);
@@ -264,6 +265,8 @@ int __init mx35_clocks_init(void)
         clk_prepare_enable(clk[gpio3_gate]);
         clk_prepare_enable(clk[iim_gate]);
         clk_prepare_enable(clk[emi_gate]);
+        clk_prepare_enable(clk[max_gate]);
+        clk_prepare_enable(clk[iomuxc_gate]);
 
         /*
          * SCC is needed to boot via mmc after a watchdog reset. The clock code
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 2f9ff93a4e61..d38e54f5b6d7 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -115,7 +115,7 @@ static const char *gpu2d_core_sels[]	= { "axi", "pll3_usb_otg", "pll2_pfd0_352m"
 static const char *gpu3d_core_sels[]    = { "mmdc_ch0_axi", "pll3_usb_otg", "pll2_pfd1_594m", "pll2_pfd2_396m", };
 static const char *gpu3d_shader_sels[] = { "mmdc_ch0_axi", "pll3_usb_otg", "pll2_pfd1_594m", "pll2_pfd9_720m", };
 static const char *ipu_sels[]           = { "mmdc_ch0_axi", "pll2_pfd2_396m", "pll3_120m", "pll3_pfd1_540m", };
-static const char *ldb_di_sels[]        = { "pll5_video", "pll2_pfd0_352m", "pll2_pfd2_396m", "mmdc_ch1_axi", "pll3_pfd1_540m", };
+static const char *ldb_di_sels[]        = { "pll5_video", "pll2_pfd0_352m", "pll2_pfd2_396m", "mmdc_ch1_axi", "pll3_usb_otg", };
 static const char *ipu_di_pre_sels[]    = { "mmdc_ch0_axi", "pll3_usb_otg", "pll5_video", "pll2_pfd0_352m", "pll2_pfd2_396m", "pll3_pfd1_540m", };
 static const char *ipu1_di0_sels[]      = { "ipu1_di0_pre", "dummy", "dummy", "ldb_di0", "ldb_di1", };
 static const char *ipu1_di1_sels[]      = { "ipu1_di1_pre", "dummy", "dummy", "ldb_di0", "ldb_di1", };
@@ -443,7 +443,6 @@ int __init mx6q_clocks_init(void)
 
         clk_register_clkdev(clk[gpt_ipg], "ipg", "imx-gpt.0");
         clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[twd], NULL, "smp_twd");
         clk_register_clkdev(clk[cko1_sel], "cko1_sel", NULL);
         clk_register_clkdev(clk[ahb], "ahb", NULL);
         clk_register_clkdev(clk[cko1], "cko1", NULL);
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 5a800bfcec5b..5bf4a97ab241 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -110,6 +110,8 @@ void tzic_handle_irq(struct pt_regs *);
 
 extern void imx_enable_cpu(int cpu, bool enable);
 extern void imx_set_cpu_jump(int cpu, void *jump_addr);
+extern u32 imx_get_cpu_arg(int cpu);
+extern void imx_set_cpu_arg(int cpu, u32 arg);
 extern void v7_cpu_resume(void);
 extern u32 *pl310_get_save_ptr(void);
 #ifdef CONFIG_SMP
diff --git a/arch/arm/mach-imx/hotplug.c b/arch/arm/mach-imx/hotplug.c
index 7bc5fe15dda2..5e91112dcbee 100644
--- a/arch/arm/mach-imx/hotplug.c
+++ b/arch/arm/mach-imx/hotplug.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/errno.h>
-#include <asm/cacheflush.h>
 #include <asm/cp15.h>
 
 #include "common.h"
@@ -20,7 +19,6 @@ static inline void cpu_enter_lowpower(void)
 {
         unsigned int v;
 
-        flush_cache_all();
         asm volatile(
                 "mcr    p15, 0, %1, c7, c5, 0\n"
         "       mcr     p15, 0, %1, c7, c10, 4\n"
@@ -46,11 +44,23 @@ static inline void cpu_enter_lowpower(void)
 void imx_cpu_die(unsigned int cpu)
 {
         cpu_enter_lowpower();
+        /*
+         * We use the cpu jumping argument register to sync with
+         * imx_cpu_kill() which is running on cpu0 and waiting for
+         * the register being cleared to kill the cpu.
+         */
+        imx_set_cpu_arg(cpu, ~0);
         cpu_do_idle();
 }
 
 int imx_cpu_kill(unsigned int cpu)
 {
+        unsigned long timeout = jiffies + msecs_to_jiffies(50);
+
+        while (imx_get_cpu_arg(cpu) == 0)
+                if (time_after(jiffies, timeout))
+                        return 0;
         imx_enable_cpu(cpu, false);
+        imx_set_cpu_arg(cpu, 0);
         return 1;
 }
diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index 03b65e5ea541..82348391582a 100644
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -27,6 +27,11 @@ static const char * const imx25_dt_board_compat[] __initconst = {
         NULL
 };
 
+static void __init imx25_timer_init(void)
+{
+        mx25_clocks_init_dt();
+}
+
 DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
         .map_io         = mx25_map_io,
         .init_early     = imx25_init_early,
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c
index e15f1555c59b..09a742f8c7ab 100644
--- a/arch/arm/mach-imx/src.c
+++ b/arch/arm/mach-imx/src.c
@@ -43,6 +43,18 @@ void imx_set_cpu_jump(int cpu, void *jump_addr)
                        src_base + SRC_GPR1 + cpu * 8);
 }
 
+u32 imx_get_cpu_arg(int cpu)
+{
+        cpu = cpu_logical_map(cpu);
+        return readl_relaxed(src_base + SRC_GPR1 + cpu * 8 + 4);
+}
+
+void imx_set_cpu_arg(int cpu, u32 arg)
+{
+        cpu = cpu_logical_map(cpu);
+        writel_relaxed(arg, src_base + SRC_GPR1 + cpu * 8 + 4);
+}
+
 void imx_src_prepare_restart(void)
 {
         u32 val;
diff --git a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
index f655b2637b0e..e5f70415905a 100644
--- a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
+++ b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
@@ -20,10 +20,15 @@ static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = {
         .duplex         = DUPLEX_FULL,
 };
 
+static struct mv643xx_eth_platform_data iomega_ix2_200_ge01_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
+};
+
 void __init iomega_ix2_200_init(void)
 {
         /*
          * Basic setup. Needs to be called early.
          */
-        kirkwood_ge01_init(&iomega_ix2_200_ge00_data);
+        kirkwood_ge00_init(&iomega_ix2_200_ge00_data);
+        kirkwood_ge01_init(&iomega_ix2_200_ge01_data);
 }
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
index 1c6e736cbbf8..08dd739aa709 100644
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -53,6 +53,8 @@ static struct mv_sata_platform_data guruplug_sata_data = {
 
 static struct mvsdio_platform_data guruplug_mvsdio_data = {
         /* unfortunately the CD signal has not been connected */
+        .gpio_card_detect = -1,
+        .gpio_write_protect = -1,
 };
 
 static struct gpio_led guruplug_led_pins[] = {
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 8ddd69fdc937..6a6eb548307d 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -55,6 +55,7 @@ static struct mv_sata_platform_data openrd_sata_data = {
 
 static struct mvsdio_platform_data openrd_mvsdio_data = {
         .gpio_card_detect = 29, /* MPP29 used as SD card detect */
+        .gpio_write_protect = -1,
 };
 
 static unsigned int openrd_mpp_config[] __initdata = {
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index c7d93b48926b..d24223166e06 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -69,6 +69,7 @@ static struct mv_sata_platform_data rd88f6281_sata_data = {
 
 static struct mvsdio_platform_data rd88f6281_mvsdio_data = {
         .gpio_card_detect = 28,
+        .gpio_write_protect = -1,
 };
 
 static unsigned int rd88f6281_mpp_config[] __initdata = {
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c
index d1e2d595e79c..f62b68d926f4 100644
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/gpio.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index 750446feb444..326a87261f9a 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -10,16 +10,12 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
 #include "common.h"
 
 static inline void cpu_enter_lowpower(void)
 {
-        /* Just flush the cache. Changing the coherency is not yet
-         * available on msm. */
-        flush_cache_all();
 }
 
 static inline void cpu_leave_lowpower(void)
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 2969027f02fa..f9fd77e8f1f5 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -62,7 +62,10 @@ static int msm_timer_set_next_event(unsigned long cycles,
 {
         u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
 
-        writel_relaxed(0, event_base + TIMER_CLEAR);
+        ctrl &= ~TIMER_ENABLE_EN;
+        writel_relaxed(ctrl, event_base + TIMER_ENABLE);
+
+        writel_relaxed(ctrl, event_base + TIMER_CLEAR);
         writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
         writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);
         return 0;
diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c
index 274ff58271de..d5970f5a1e8d 100644
--- a/arch/arm/mach-mvebu/irq-armada-370-xp.c
+++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c
@@ -44,6 +44,8 @@
 
 #define ARMADA_370_XP_MAX_PER_CPU_IRQS          (28)
 
+#define ARMADA_370_XP_TIMER0_PER_CPU_IRQ        (5)
+
 #define ACTIVE_DOORBELLS                        (8)
 
 static DEFINE_RAW_SPINLOCK(irq_controller_lock);
@@ -59,36 +61,26 @@ static struct irq_domain *armada_370_xp_mpic_domain;
  */
 static void armada_370_xp_irq_mask(struct irq_data *d)
 {
-#ifdef CONFIG_SMP
         irq_hw_number_t hwirq = irqd_to_hwirq(d);
 
-        if (hwirq > ARMADA_370_XP_MAX_PER_CPU_IRQS)
+        if (hwirq != ARMADA_370_XP_TIMER0_PER_CPU_IRQ)
                 writel(hwirq, main_int_base +
                                 ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS);
         else
                 writel(hwirq, per_cpu_int_base +
                                 ARMADA_370_XP_INT_SET_MASK_OFFS);
-#else
-        writel(irqd_to_hwirq(d),
-               per_cpu_int_base + ARMADA_370_XP_INT_SET_MASK_OFFS);
-#endif
 }
 
 static void armada_370_xp_irq_unmask(struct irq_data *d)
 {
-#ifdef CONFIG_SMP
         irq_hw_number_t hwirq = irqd_to_hwirq(d);
 
-        if (hwirq > ARMADA_370_XP_MAX_PER_CPU_IRQS)
+        if (hwirq != ARMADA_370_XP_TIMER0_PER_CPU_IRQ)
                 writel(hwirq, main_int_base +
                                 ARMADA_370_XP_INT_SET_ENABLE_OFFS);
         else
                 writel(hwirq, per_cpu_int_base +
                                 ARMADA_370_XP_INT_CLEAR_MASK_OFFS);
-#else
-        writel(irqd_to_hwirq(d),
-               per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS);
-#endif
 }
 
 #ifdef CONFIG_SMP
@@ -144,10 +136,14 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h,
                                       unsigned int virq, irq_hw_number_t hw)
 {
         armada_370_xp_irq_mask(irq_get_irq_data(virq));
-        writel(hw, main_int_base + ARMADA_370_XP_INT_SET_ENABLE_OFFS);
+        if (hw != ARMADA_370_XP_TIMER0_PER_CPU_IRQ)
+                writel(hw, per_cpu_int_base +
+                        ARMADA_370_XP_INT_CLEAR_MASK_OFFS);
+        else
+                writel(hw, main_int_base + ARMADA_370_XP_INT_SET_ENABLE_OFFS);
         irq_set_status_flags(virq, IRQ_LEVEL);
 
-        if (hw < ARMADA_370_XP_MAX_PER_CPU_IRQS) {
+        if (hw == ARMADA_370_XP_TIMER0_PER_CPU_IRQ) {
                 irq_set_percpu_devid(virq);
                 irq_set_chip_and_handler(virq, &armada_370_xp_irq_chip,
                                         handle_percpu_devid_irq);
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 3218f1f2c0e0..e7b781d3788f 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -41,8 +41,6 @@ static struct fb_videomode mx23evk_video_modes[] = {
                 .lower_margin   = 4,
                 .hsync_len      = 1,
                 .vsync_len      = 1,
-                .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT |
-                                  FB_SYNC_DOTCLK_FAILING_ACT,
         },
 };
 
@@ -59,8 +57,6 @@ static struct fb_videomode mx28evk_video_modes[] = {
                 .lower_margin   = 10,
                 .hsync_len      = 10,
                 .vsync_len      = 10,
-                .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT |
-                                  FB_SYNC_DOTCLK_FAILING_ACT,
         },
 };
 
@@ -77,7 +73,6 @@ static struct fb_videomode m28evk_video_modes[] = {
                 .lower_margin   = 45,
                 .hsync_len      = 1,
                 .vsync_len      = 1,
-                .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT,
         },
 };
 
@@ -94,9 +89,7 @@ static struct fb_videomode apx4devkit_video_modes[] = {
                 .lower_margin   = 13,
                 .hsync_len      = 48,
                 .vsync_len      = 3,
-                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
-                                  FB_SYNC_DATA_ENABLE_HIGH_ACT |
-                                  FB_SYNC_DOTCLK_FAILING_ACT,
+                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
         },
 };
 
@@ -113,9 +106,7 @@ static struct fb_videomode apf28dev_video_modes[] = {
                 .lower_margin = 0x15,
                 .hsync_len = 64,
                 .vsync_len = 4,
-                .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
-                                FB_SYNC_DATA_ENABLE_HIGH_ACT |
-                                FB_SYNC_DOTCLK_FAILING_ACT,
+                .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
         },
 };
 
@@ -132,7 +123,6 @@ static struct fb_videomode cfa10049_video_modes[] = {
                 .lower_margin   = 2,
                 .hsync_len      = 15,
                 .vsync_len      = 15,
-                .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT
         },
 };
 
@@ -259,6 +249,8 @@ static void __init imx23_evk_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(mx23evk_video_modes);
         mxsfb_pdata.default_bpp = 32;
         mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
+                                MXSFB_SYNC_DOTCLK_FAILING_ACT;
 }
 
 static inline void enable_clk_enet_out(void)
@@ -278,6 +270,8 @@ static void __init imx28_evk_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(mx28evk_video_modes);
         mxsfb_pdata.default_bpp = 32;
         mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
+                                MXSFB_SYNC_DOTCLK_FAILING_ACT;
 
         mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
 }
@@ -297,6 +291,7 @@ static void __init m28evk_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);
         mxsfb_pdata.default_bpp = 16;
         mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
 }
 
 static void __init sc_sps1_init(void)
@@ -322,6 +317,8 @@ static void __init apx4devkit_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(apx4devkit_video_modes);
         mxsfb_pdata.default_bpp = 32;
         mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
+                                MXSFB_SYNC_DOTCLK_FAILING_ACT;
 }
 
 #define ENET0_MDC__GPIO_4_0     MXS_GPIO_NR(4, 0)
@@ -407,6 +404,7 @@ static void __init cfa10049_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes);
         mxsfb_pdata.default_bpp = 32;
         mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
 }
 
 static void __init cfa10037_init(void)
@@ -423,6 +421,8 @@ static void __init apf28_init(void)
         mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);
         mxsfb_pdata.default_bpp = 16;
         mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT;
+        mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
+                                MXSFB_SYNC_DOTCLK_FAILING_ACT;
 }
 
 static void __init mxs_machine_init(void)
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index cb7c6ae2e3fc..6c4f766365a2 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -543,15 +543,6 @@ static struct clk usb_dc_ck = {
         /* Direct from ULPD, no parent */
         .rate           = 48000000,
         .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
-        .enable_bit     = USB_REQ_EN_SHIFT,
-};
-
-static struct clk usb_dc_ck7xx = {
-        .name           = "usb_dc_ck",
-        .ops            = &clkops_generic,
-        /* Direct from ULPD, no parent */
-        .rate           = 48000000,
-        .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
         .enable_bit     = SOFT_USB_OTG_DPLL_REQ_SHIFT,
 };
 
@@ -727,8 +718,7 @@ static struct omap_clk omap_clks[] = {
         CLK(NULL,       "usb_clko",     &usb_clko,      CK_16XX | CK_1510 | CK_310),
         CLK(NULL,       "usb_hhc_ck",   &usb_hhc_ck1510, CK_1510 | CK_310),
         CLK(NULL,       "usb_hhc_ck",   &usb_hhc_ck16xx, CK_16XX),
-        CLK(NULL,       "usb_dc_ck",    &usb_dc_ck,     CK_16XX),
-        CLK(NULL,       "usb_dc_ck",    &usb_dc_ck7xx,  CK_7XX),
+        CLK(NULL,       "usb_dc_ck",    &usb_dc_ck,     CK_16XX | CK_7XX),
         CLK(NULL,       "mclk",         &mclk_1510,     CK_1510 | CK_310),
         CLK(NULL,       "mclk",         &mclk_16xx,     CK_16XX),
         CLK(NULL,       "bclk",         &bclk_1510,     CK_1510 | CK_310),
diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c
index 3d58f335f173..0c6834ae1fc4 100644
--- a/arch/arm/mach-omap2/cclock44xx_data.c
+++ b/arch/arm/mach-omap2/cclock44xx_data.c
@@ -52,6 +52,13 @@
  */
 #define OMAP4_DPLL_ABE_DEFFREQ                          98304000
 
+/*
+ * OMAP4 USB DPLL default frequency. In OMAP4430 TRM version V, section
+ * "3.6.3.9.5 DPLL_USB Preferred Settings" shows that the preferred
+ * locked frequency for the USB DPLL is 960MHz.
+ */
+#define OMAP4_DPLL_USB_DEFFREQ                          960000000
+
 /* Root clocks */
 
 DEFINE_CLK_FIXED_RATE(extalt_clkin_ck, CLK_IS_ROOT, 59000000, 0x0);
@@ -1011,6 +1018,10 @@ DEFINE_CLK_OMAP_MUX(hsmmc2_fclk, "l3_init_clkdm", hsmmc1_fclk_sel,
                     OMAP4430_CM_L3INIT_MMC2_CLKCTRL, OMAP4430_CLKSEL_MASK,
                     hsmmc1_fclk_parents, func_dmic_abe_gfclk_ops);
 
+DEFINE_CLK_GATE(ocp2scp_usb_phy_phy_48m, "func_48m_fclk", &func_48m_fclk, 0x0,
+                OMAP4430_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL,
+                OMAP4430_OPTFCLKEN_PHY_48M_SHIFT, 0x0, NULL);
+
 DEFINE_CLK_GATE(sha2md5_fck, "l3_div_ck", &l3_div_ck, 0x0,
                 OMAP4430_CM_L4SEC_SHA2MD51_CLKCTRL,
                 OMAP4430_MODULEMODE_SWCTRL_SHIFT, 0x0, NULL);
@@ -1538,6 +1549,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "per_mcbsp4_gfclk",                     &per_mcbsp4_gfclk,      CK_443X),
         CLK(NULL,       "hsmmc1_fclk",                  &hsmmc1_fclk,   CK_443X),
         CLK(NULL,       "hsmmc2_fclk",                  &hsmmc2_fclk,   CK_443X),
+        CLK(NULL,       "ocp2scp_usb_phy_phy_48m",      &ocp2scp_usb_phy_phy_48m,       CK_443X),
         CLK(NULL,       "sha2md5_fck",                  &sha2md5_fck,   CK_443X),
         CLK(NULL,       "slimbus1_fclk_1",              &slimbus1_fclk_1,       CK_443X),
         CLK(NULL,       "slimbus1_fclk_0",              &slimbus1_fclk_0,       CK_443X),
@@ -1705,5 +1717,13 @@ int __init omap4xxx_clk_init(void)
         if (rc)
                 pr_err("%s: failed to configure ABE DPLL!\n", __func__);
 
+        /*
+         * Lock USB DPLL on OMAP4 devices so that the L3INIT power
+         * domain can transition to retention state when not in use.
+         */
+        rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);
+        if (rc)
+                pr_err("%s: failed to configure USB DPLL!\n", __func__);
+
         return 0;
 }
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 40f4a03d728f..d6ba13e1c540 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -293,5 +293,8 @@ extern void omap_reserve(void);
 struct omap_hwmod;
 extern int omap_dss_reset(struct omap_hwmod *);
 
+/* SoC specific clock initializer */
+extern int (*omap_clk_init)(void);
+
 #endif /* __ASSEMBLER__ */
 #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 2c3fdd65387b..5c445ca1e271 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -55,6 +55,12 @@
 #include "prm44xx.h"
 
 /*
+ * omap_clk_init: points to a function that does the SoC-specific
+ * clock initializations
+ */
+int (*omap_clk_init)(void);
+
+/*
  * The machine specific code may provide the extra mapping besides the
  * default mapping provided here.
  */
@@ -397,7 +403,7 @@ void __init omap2420_init_early(void)
         omap242x_clockdomains_init();
         omap2420_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap2420_clk_init();
+        omap_clk_init = omap2420_clk_init;
 }
 
 void __init omap2420_init_late(void)
@@ -427,7 +433,7 @@ void __init omap2430_init_early(void)
         omap243x_clockdomains_init();
         omap2430_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap2430_clk_init();
+        omap_clk_init = omap2430_clk_init;
 }
 
 void __init omap2430_init_late(void)
@@ -462,7 +468,7 @@ void __init omap3_init_early(void)
         omap3xxx_clockdomains_init();
         omap3xxx_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap3xxx_clk_init();
+        omap_clk_init = omap3xxx_clk_init;
 }
 
 void __init omap3430_init_early(void)
@@ -500,7 +506,7 @@ void __init ti81xx_init_early(void)
         omap3xxx_clockdomains_init();
         omap3xxx_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap3xxx_clk_init();
+        omap_clk_init = omap3xxx_clk_init;
 }
 
 void __init omap3_init_late(void)
@@ -568,7 +574,7 @@ void __init am33xx_init_early(void)
         am33xx_clockdomains_init();
         am33xx_hwmod_init();
         omap_hwmod_init_postsetup();
-        am33xx_clk_init();
+        omap_clk_init = am33xx_clk_init;
 }
 #endif
 
@@ -593,7 +599,7 @@ void __init omap4430_init_early(void)
         omap44xx_clockdomains_init();
         omap44xx_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap4xxx_clk_init();
+        omap_clk_init = omap4xxx_clk_init;
 }
 
 void __init omap4430_init_late(void)
diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index e712d1725a8b..ceb30a59bf28 100644
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -35,9 +35,6 @@ void __ref omap4_cpu_die(unsigned int cpu)
         unsigned int boot_cpu = 0;
         void __iomem *base = omap_get_wakeupgen_base();
 
-        flush_cache_all();
-        dsb();
-
         /*
          * we're ready for shutdown now, so do it
          */
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index c2c798c08c2b..a202a4785104 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1368,7 +1368,9 @@ static void _enable_sysc(struct omap_hwmod *oh)
         }
 
         if (sf & SYSC_HAS_MIDLEMODE) {
-                if (oh->flags & HWMOD_SWSUP_MSTANDBY) {
+                if (oh->flags & HWMOD_FORCE_MSTANDBY) {
+                        idlemode = HWMOD_IDLEMODE_FORCE;
+                } else if (oh->flags & HWMOD_SWSUP_MSTANDBY) {
                         idlemode = HWMOD_IDLEMODE_NO;
                 } else {
                         if (sf & SYSC_HAS_ENAWAKEUP)
@@ -1440,7 +1442,8 @@ static void _idle_sysc(struct omap_hwmod *oh)
         }
 
         if (sf & SYSC_HAS_MIDLEMODE) {
-                if (oh->flags & HWMOD_SWSUP_MSTANDBY) {
+                if ((oh->flags & HWMOD_SWSUP_MSTANDBY) ||
+                    (oh->flags & HWMOD_FORCE_MSTANDBY)) {
                         idlemode = HWMOD_IDLEMODE_FORCE;
                 } else {
                         if (sf & SYSC_HAS_ENAWAKEUP)
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
index d43d9b608eda..d5dc935f6060 100644
--- a/arch/arm/mach-omap2/omap_hwmod.h
+++ b/arch/arm/mach-omap2/omap_hwmod.h
@@ -427,8 +427,8 @@ struct omap_hwmod_omap4_prcm {
  *
  * HWMOD_SWSUP_SIDLE: omap_hwmod code should manually bring module in and out
  *     of idle, rather than relying on module smart-idle
- * HWMOD_SWSUP_MSTDBY: omap_hwmod code should manually bring module in and out
- *     of standby, rather than relying on module smart-standby
+ * HWMOD_SWSUP_MSTANDBY: omap_hwmod code should manually bring module in and
+ *     out of standby, rather than relying on module smart-standby
  * HWMOD_INIT_NO_RESET: don't reset this module at boot - important for
  *     SDRAM controller, etc. XXX probably belongs outside the main hwmod file
  *     XXX Should be HWMOD_SETUP_NO_RESET
@@ -459,6 +459,10 @@ struct omap_hwmod_omap4_prcm {
  *     correctly, or this is being abused to deal with some PM latency
  *     issues -- but we're currently suffering from a shortage of
  *     folks who are able to track these issues down properly.
+ * HWMOD_FORCE_MSTANDBY: Always keep MIDLEMODE bits cleared so that device
+ *     is kept in force-standby mode. Failing to do so causes PM problems
+ *     with musb on OMAP3630 at least. Note that musb has a dedicated register
+ *     to control MSTANDBY signal when MIDLEMODE is set to force-standby.
  */
 #define HWMOD_SWSUP_SIDLE                       (1 << 0)
 #define HWMOD_SWSUP_MSTANDBY                    (1 << 1)
@@ -471,6 +475,7 @@ struct omap_hwmod_omap4_prcm {
 #define HWMOD_16BIT_REG                         (1 << 8)
 #define HWMOD_EXT_OPT_MAIN_CLK                  (1 << 9)
 #define HWMOD_BLOCK_WFI                         (1 << 10)
+#define HWMOD_FORCE_MSTANDBY                    (1 << 11)
 
 /*
  * omap_hwmod._int_flags definitions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index ac7e03ec952f..5112d04e7b79 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1707,9 +1707,14 @@ static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {
          * Erratum ID: i479  idle_req / idle_ack mechanism potentially
          * broken when autoidle is enabled
          * workaround is to disable the autoidle bit at module level.
+         *
+         * Enabling the device in any other MIDLEMODE setting but force-idle
+         * causes core_pwrdm not enter idle states at least on OMAP3630.
+         * Note that musb has OTG_FORCESTDBY register that controls MSTANDBY
+         * signal when MIDLEMODE is set to force-idle.
          */
         .flags          = HWMOD_NO_OCP_AUTOIDLE | HWMOD_SWSUP_SIDLE
-                                | HWMOD_SWSUP_MSTANDBY,
+                                | HWMOD_FORCE_MSTANDBY,
 };
 
 /* usb_otg_hs */
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0e47d2e1687c..9e0576569e07 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2714,6 +2714,10 @@ static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = {
         { }
 };
 
+static struct omap_hwmod_opt_clk ocp2scp_usb_phy_opt_clks[] = {
+        { .role = "48mhz", .clk = "ocp2scp_usb_phy_phy_48m" },
+};
+
 /* ocp2scp_usb_phy */
 static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {
         .name           = "ocp2scp_usb_phy",
@@ -2728,6 +2732,8 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {
                 },
         },
         .dev_attr       = ocp2scp_dev_attr,
+        .opt_clks       = ocp2scp_usb_phy_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(ocp2scp_usb_phy_opt_clks),
 };
 
 /*
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 2bdd4cf17a8f..f62b509ed08d 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -547,6 +547,8 @@ static inline void __init realtime_counter_init(void)
                                clksrc_nr, clksrc_src)                   \
 void __init omap##name##_gptimer_timer_init(void)                       \
 {                                                                       \
+        if (omap_clk_init)                                              \
+                omap_clk_init();                                        \
         omap_dmtimer_init();                                            \
         omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);    \
         omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src);        \
@@ -556,6 +558,8 @@ void __init omap##name##_gptimer_timer_init(void)			\
                                 clksrc_nr, clksrc_src)                  \
 void __init omap##name##_sync32k_timer_init(void)               \
 {                                                                       \
+        if (omap_clk_init)                                              \
+                omap_clk_init();                                        \
         omap_dmtimer_init();                                            \
         omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);    \
         /* Enable the use of clocksource="gp_timer" kernel parameter */ \
diff --git a/arch/arm/mach-prima2/hotplug.c b/arch/arm/mach-prima2/hotplug.c
index f4b17cbababd..0ab2f8bae28e 100644
--- a/arch/arm/mach-prima2/hotplug.c
+++ b/arch/arm/mach-prima2/hotplug.c
@@ -10,13 +10,10 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
 static inline void platform_do_lowpower(unsigned int cpu)
 {
-        flush_cache_all();
-
         /* we put the platform to just WFI */
         for (;;) {
                 __asm__ __volatile__("dsb\n\t" "wfi\n\t"
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c
index 53818e5cd3ad..ac22dd41b135 100644
--- a/arch/arm/mach-realview/hotplug.c
+++ b/arch/arm/mach-realview/hotplug.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-#include <asm/cacheflush.h>
 #include <asm/cp15.h>
 #include <asm/smp_plat.h>
 
@@ -20,7 +19,6 @@ static inline void cpu_enter_lowpower(void)
 {
         unsigned int v;
 
-        flush_cache_all();
         asm volatile(
         "       mcr     p15, 0, %1, c7, c5, 0\n"
         "       mcr     p15, 0, %1, c7, c10, 4\n"
diff --git a/arch/arm/mach-s3c24xx/include/mach/irqs.h b/arch/arm/mach-s3c24xx/include/mach/irqs.h
index b7a9f4d469e8..1e73f5fa8659 100644
--- a/arch/arm/mach-s3c24xx/include/mach/irqs.h
+++ b/arch/arm/mach-s3c24xx/include/mach/irqs.h
@@ -188,10 +188,8 @@
 
 #if defined(CONFIG_CPU_S3C2416)
 #define NR_IRQS (IRQ_S3C2416_I2S1 + 1)
-#elif defined(CONFIG_CPU_S3C2443)
-#define NR_IRQS (IRQ_S3C2443_AC97+1)
 #else
-#define NR_IRQS (IRQ_S3C2440_AC97+1)
+#define NR_IRQS (IRQ_S3C2443_AC97 + 1)
 #endif
 
 /* compatibility define. */
diff --git a/arch/arm/mach-s3c24xx/irq.c b/arch/arm/mach-s3c24xx/irq.c
index cb9f5e011e73..d8ba9bee4c7e 100644
--- a/arch/arm/mach-s3c24xx/irq.c
+++ b/arch/arm/mach-s3c24xx/irq.c
@@ -500,7 +500,7 @@ struct s3c_irq_intc *s3c24xx_init_intc(struct device_node *np,
                 base = (void *)0xfd000000;
 
                 intc->reg_mask = base + 0xa4;
-                intc->reg_pending = base + 0x08;
+                intc->reg_pending = base + 0xa8;
                 irq_num = 20;
                 irq_start = S3C2410_IRQ(32);
                 irq_offset = 4;
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index fcdf52dbcc49..f051f53e35b7 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -214,11 +214,6 @@ static struct clk clk_pcmcdclk2 = {
         .name           = "pcmcdclk",
 };
 
-static struct clk dummy_apb_pclk = {
-        .name           = "apb_pclk",
-        .id             = -1,
-};
-
 static struct clk *clkset_vpllsrc_list[] = {
         [0] = &clk_fin_vpll,
         [1] = &clk_sclk_hdmi27m,
@@ -305,18 +300,6 @@ static struct clk_ops clk_fout_apll_ops = {
 
 static struct clk init_clocks_off[] = {
         {
-                .name           = "dma",
-                .devname        = "dma-pl330.0",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330.1",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
                 .name           = "rot",
                 .parent         = &clk_hclk_dsys.clk,
                 .enable         = s5pv210_clk_ip0_ctrl,
@@ -573,6 +556,20 @@ static struct clk clk_hsmmc3 = {
         .ctrlbit        = (1<<19),
 };
 
+static struct clk clk_pdma0 = {
+        .name           = "pdma0",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip0_ctrl,
+        .ctrlbit        = (1 << 3),
+};
+
+static struct clk clk_pdma1 = {
+        .name           = "pdma1",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip0_ctrl,
+        .ctrlbit        = (1 << 4),
+};
+
 static struct clk *clkset_uart_list[] = {
         [6] = &clk_mout_mpll.clk,
         [7] = &clk_mout_epll.clk,
@@ -1075,6 +1072,8 @@ static struct clk *clk_cdev[] = {
         &clk_hsmmc1,
         &clk_hsmmc2,
         &clk_hsmmc3,
+        &clk_pdma0,
+        &clk_pdma1,
 };
 
 /* Clock initialisation code */
@@ -1333,6 +1332,8 @@ static struct clk_lookup s5pv210_clk_lookup[] = {
         CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
         CLKDEV_INIT("s5pv210-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
         CLKDEV_INIT("s5pv210-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
+        CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
 };
 
 void __init s5pv210_register_clocks(void)
@@ -1361,6 +1362,5 @@ void __init s5pv210_register_clocks(void)
         for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
                 s3c_disable_clocks(clk_cdev[ptr], 1);
 
-        s3c24xx_register_clock(&dummy_apb_pclk);
         s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 3a38f7b34b94..e373de44a8b6 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = {
                 .mux_id         = 0,
                 .flags          = V4L2_MBUS_PCLK_SAMPLE_FALLING |
                                   V4L2_MBUS_VSYNC_ACTIVE_LOW,
-                .bus_type       = FIMC_BUS_TYPE_ITU_601,
+                .fimc_bus_type  = FIMC_BUS_TYPE_ITU_601,
                 .board_info     = &noon010pc30_board_info,
                 .i2c_bus_num    = 0,
                 .clk_frequency  = 16000000UL,
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index cdcb799e802f..fec49ebc359a 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -32,6 +32,7 @@
 #include <linux/smsc911x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/sh_hspi.h>
+#include <linux/mmc/host.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index acb46a94ccdf..2f1ef1bc805d 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -119,14 +119,6 @@ static int sh73a0_cpu_kill(unsigned int cpu)
 
 static void sh73a0_cpu_die(unsigned int cpu)
 {
-        /*
-         * The ARM MPcore does not issue a cache coherency request for the L1
-         * cache when powering off single CPUs. We must take care of this and
-         * further caches.
-         */
-        dsb();
-        flush_cache_all();
-
         /* Set power off mode. This takes the CPU out of the MP cluster */
         scu_power_mode(scu_base_addr(), SCU_PM_POWEROFF);
 
diff --git a/arch/arm/mach-spear13xx/hotplug.c b/arch/arm/mach-spear13xx/hotplug.c
index a7d2dd11a4f2..d97749c642ce 100644
--- a/arch/arm/mach-spear13xx/hotplug.c
+++ b/arch/arm/mach-spear13xx/hotplug.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/smp.h>
-#include <asm/cacheflush.h>
 #include <asm/cp15.h>
 #include <asm/smp_plat.h>
 
@@ -21,7 +20,6 @@ static inline void cpu_enter_lowpower(void)
 {
         unsigned int v;
 
-        flush_cache_all();
         asm volatile(
         "       mcr     p15, 0, %1, c7, c5, 0\n"
         "       dsb\n"
diff --git a/arch/arm/mach-tegra/common.h b/arch/arm/mach-tegra/common.h
index 32f8eb3fe344..5900cc44f780 100644
--- a/arch/arm/mach-tegra/common.h
+++ b/arch/arm/mach-tegra/common.h
@@ -2,4 +2,3 @@ extern struct smp_operations tegra_smp_ops;
 
 extern int tegra_cpu_kill(unsigned int cpu);
 extern void tegra_cpu_die(unsigned int cpu);
-extern int tegra_cpu_disable(unsigned int cpu);
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index a599f6e36dea..e8323bc95770 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -12,7 +12,6 @@
 #include <linux/smp.h>
 #include <linux/clk/tegra.h>
 
-#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
 #include "sleep.h"
@@ -47,15 +46,6 @@ void __ref tegra_cpu_die(unsigned int cpu)
         BUG();
 }
 
-int tegra_cpu_disable(unsigned int cpu)
-{
-        /*
-         * we don't allow CPU 0 to be shutdown (it is still too special
-         * e.g. clock tick interrupts)
-         */
-        return cpu == 0 ? -EPERM : 0;
-}
-
 #ifdef CONFIG_ARCH_TEGRA_2x_SOC
 extern void tegra20_hotplug_shutdown(void);
 void __init tegra20_hotplug_init(void)
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 2c6b3d55213b..ec33ec86aad9 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -192,6 +192,5 @@ struct smp_operations tegra_smp_ops __initdata = {
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_kill               = tegra_cpu_kill,
         .cpu_die                = tegra_cpu_die,
-        .cpu_disable            = tegra_cpu_disable,
 #endif
 };
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 051b62c27102..7f2cb6c5e2c1 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -81,7 +81,6 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
 #endif
 
 struct mmci_platform_data mop500_sdi0_data = {
-        .ios_handler    = mop500_sdi0_ios_handler,
         .ocr_mask       = MMC_VDD_29_30,
         .f_max          = 50000000,
         .capabilities   = MMC_CAP_4_BIT_DATA |
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index b03457881c4b..87d2d7b38ce9 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
 #include <linux/platform_data/i2c-nomadik.h>
@@ -439,6 +440,15 @@ static void mop500_prox_deactivate(struct device *dev)
         regulator_put(prox_regulator);
 }
 
+void mop500_snowball_ethernet_clock_enable(void)
+{
+        struct clk *clk;
+
+        clk = clk_get_sys("fsmc", NULL);
+        if (!IS_ERR(clk))
+                clk_prepare_enable(clk);
+}
+
 static struct cryp_platform_data u8500_cryp1_platform_data = {
                 .mem_to_engine = {
                                 .dir = STEDMA40_MEM_TO_PERIPH,
@@ -683,6 +693,8 @@ static void __init snowball_init_machine(void)
         mop500_audio_init(parent);
         mop500_uart_init(parent);
 
+        mop500_snowball_ethernet_clock_enable();
+
         /* This board has full regulator constraints */
         regulator_has_full_constraints();
 }
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index eaa605f5d90d..d38951be70df 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -104,6 +104,7 @@ void __init mop500_pinmaps_init(void);
 void __init snowball_pinmaps_init(void);
 void __init hrefv60_pinmaps_init(void);
 void mop500_audio_init(struct device *parent);
+void mop500_snowball_ethernet_clock_enable(void);
 
 int __init mop500_uib_init(void);
 void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 19235cf7bbe3..f1a581844372 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -312,9 +312,10 @@ static void __init u8500_init_machine(void)
         /* Pinmaps must be in place before devices register */
         if (of_machine_is_compatible("st-ericsson,mop500"))
                 mop500_pinmaps_init();
-        else if (of_machine_is_compatible("calaosystems,snowball-a9500"))
+        else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
                 snowball_pinmaps_init();
-        else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
+                mop500_snowball_ethernet_clock_enable();
+        } else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
                 hrefv60_pinmaps_init();
         else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
                 /* TODO: Add pinmaps for ccu9540 board. */
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index 2f6af259015d..1c55a55dd89e 100644
--- a/arch/arm/mach-ux500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
 #include <mach/setup.h>
@@ -24,8 +23,6 @@
  */
 void __ref ux500_cpu_die(unsigned int cpu)
 {
-        flush_cache_all();
-
         /* directly enter low power state, skipping secure registers */
         for (;;) {
                 __asm__ __volatile__("dsb\n\t" "wfi\n\t"
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index a141b98d84fe..f0ce6b8f5e71 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/cp15.h>
 
@@ -20,7 +19,6 @@ static inline void cpu_enter_lowpower(void)
 {
         unsigned int v;
 
-        flush_cache_all();
         asm volatile(
                 "mcr    p15, 0, %1, c7, c5, 0\n"
         "       mcr     p15, 0, %1, c7, c10, 4\n"
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index cb812a13e299..35955b54944c 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -43,7 +43,7 @@ config CPU_ARM740T
         depends on !MMU
         select CPU_32v4T
         select CPU_ABRT_LV4T
-        select CPU_CACHE_V3     # although the core is v4t
+        select CPU_CACHE_V4
         select CPU_CP15_MPU
         select CPU_PABRT_LEGACY
         help
@@ -476,9 +476,6 @@ config CPU_PABRT_V7
         bool
 
 # The cache model
-config CPU_CACHE_V3
-        bool
-
 config CPU_CACHE_V4
         bool
 
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 4e333fa2756f..9e51be96f635 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -33,7 +33,6 @@ obj-$(CONFIG_CPU_PABRT_LEGACY)	+= pabort-legacy.o
 obj-$(CONFIG_CPU_PABRT_V6)      += pabort-v6.o
 obj-$(CONFIG_CPU_PABRT_V7)      += pabort-v7.o
 
-obj-$(CONFIG_CPU_CACHE_V3)      += cache-v3.o
 obj-$(CONFIG_CPU_CACHE_V4)      += cache-v4.o
 obj-$(CONFIG_CPU_CACHE_V4WT)    += cache-v4wt.o
 obj-$(CONFIG_CPU_CACHE_V4WB)    += cache-v4wb.o
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index dd3d59122cc3..48bc3c0a87ce 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -343,6 +343,7 @@ void __init feroceon_l2_init(int __l2_wt_override)
         outer_cache.inv_range = feroceon_l2_inv_range;
         outer_cache.clean_range = feroceon_l2_clean_range;
         outer_cache.flush_range = feroceon_l2_flush_range;
+        outer_cache.inv_all = l2_inv_all;
 
         enable_l2();
 
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index c2f37390308a..c465faca51b0 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -299,7 +299,7 @@ static void l2x0_unlock(u32 cache_id)
         int lockregs;
         int i;
 
-        switch (cache_id) {
+        switch (cache_id & L2X0_CACHE_ID_PART_MASK) {
         case L2X0_CACHE_ID_PART_L310:
                 lockregs = 8;
                 break;
@@ -333,15 +333,14 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
         if (cache_id_part_number_from_dt)
                 cache_id = cache_id_part_number_from_dt;
         else
-                cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID)
-                        & L2X0_CACHE_ID_PART_MASK;
+                cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID);
         aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
 
         aux &= aux_mask;
         aux |= aux_val;
 
         /* Determine the number of ways */
-        switch (cache_id) {
+        switch (cache_id & L2X0_CACHE_ID_PART_MASK) {
         case L2X0_CACHE_ID_PART_L310:
                 if (aux & (1 << 16))
                         ways = 16;
@@ -725,7 +724,6 @@ static const struct l2x0_of_data pl310_data = {
                 .flush_all   = l2x0_flush_all,
                 .inv_all     = l2x0_inv_all,
                 .disable     = l2x0_disable,
-                .set_debug   = pl310_set_debug,
         },
 };
 
@@ -814,9 +812,8 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
                 data->save();
 
         of_init = true;
-        l2x0_init(l2x0_base, aux_val, aux_mask);
-
         memcpy(&outer_cache, &data->outer_cache, sizeof(outer_cache));
+        l2x0_init(l2x0_base, aux_val, aux_mask);
 
         return 0;
 }
diff --git a/arch/arm/mm/cache-v3.S b/arch/arm/mm/cache-v3.S
deleted file mode 100644
index 8a3fadece8d3..000000000000
--- a/arch/arm/mm/cache-v3.S
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  linux/arch/arm/mm/cache-v3.S
- *
- *  Copyright (C) 1997-2002 Russell king
- *
- * 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/linkage.h>
-#include <linux/init.h>
-#include <asm/page.h>
-#include "proc-macros.S"
-
-/*
- *      flush_icache_all()
- *
- *      Unconditionally clean and invalidate the entire icache.
- */
-ENTRY(v3_flush_icache_all)
-        mov     pc, lr
-ENDPROC(v3_flush_icache_all)
-
-/*
- *      flush_user_cache_all()
- *
- *      Invalidate all cache entries in a particular address
- *      space.
- *
- *      - mm    - mm_struct describing address space
- */
-ENTRY(v3_flush_user_cache_all)
-        /* FALLTHROUGH */
-/*
- *      flush_kern_cache_all()
- *
- *      Clean and invalidate the entire cache.
- */
-ENTRY(v3_flush_kern_cache_all)
-        /* FALLTHROUGH */
-
-/*
- *      flush_user_cache_range(start, end, flags)
- *
- *      Invalidate a range of cache entries in the specified
- *      address space.
- *
- *      - start - start address (may not be aligned)
- *      - end   - end address (exclusive, may not be aligned)
- *      - flags - vma_area_struct flags describing address space
- */
-ENTRY(v3_flush_user_cache_range)
-        mov     ip, #0
-        mcreq   p15, 0, ip, c7, c0, 0           @ flush ID cache
-        mov     pc, lr
-
-/*
- *      coherent_kern_range(start, end)
- *
- *      Ensure coherency between the Icache and the Dcache in the
- *      region described by start.  If you have non-snooping
- *      Harvard caches, you need to implement this function.
- *
- *      - start  - virtual start address
- *      - end    - virtual end address
- */
-ENTRY(v3_coherent_kern_range)
-        /* FALLTHROUGH */
-
-/*
- *      coherent_user_range(start, end)
- *
- *      Ensure coherency between the Icache and the Dcache in the
- *      region described by start.  If you have non-snooping
- *      Harvard caches, you need to implement this function.
- *
- *      - start  - virtual start address
- *      - end    - virtual end address
- */
-ENTRY(v3_coherent_user_range)
-        mov     r0, #0
-        mov     pc, lr
-
-/*
- *      flush_kern_dcache_area(void *page, size_t size)
- *
- *      Ensure no D cache aliasing occurs, either with itself or
- *      the I cache
- *
- *      - addr  - kernel address
- *      - size  - region size
- */
-ENTRY(v3_flush_kern_dcache_area)
-        /* FALLTHROUGH */
-
-/*
- *      dma_flush_range(start, end)
- *
- *      Clean and invalidate the specified virtual address range.
- *
- *      - start  - virtual start address
- *      - end    - virtual end address
- */
-ENTRY(v3_dma_flush_range)
-        mov     r0, #0
-        mcr     p15, 0, r0, c7, c0, 0           @ flush ID cache
-        mov     pc, lr
-
-/*
- *      dma_unmap_area(start, size, dir)
- *      - start - kernel virtual start address
- *      - size  - size of region
- *      - dir   - DMA direction
- */
-ENTRY(v3_dma_unmap_area)
-        teq     r2, #DMA_TO_DEVICE
-        bne     v3_dma_flush_range
-        /* FALLTHROUGH */
-
-/*
- *      dma_map_area(start, size, dir)
- *      - start - kernel virtual start address
- *      - size  - size of region
- *      - dir   - DMA direction
- */
-ENTRY(v3_dma_map_area)
-        mov     pc, lr
-ENDPROC(v3_dma_unmap_area)
-ENDPROC(v3_dma_map_area)
-
-        .globl  v3_flush_kern_cache_louis
-        .equ    v3_flush_kern_cache_louis, v3_flush_kern_cache_all
-
-        __INITDATA
-
-        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
-        define_cache_functions v3
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S
index 43e5d77be677..a7ba68f59f0c 100644
--- a/arch/arm/mm/cache-v4.S
+++ b/arch/arm/mm/cache-v4.S
@@ -58,7 +58,7 @@ ENTRY(v4_flush_kern_cache_all)
 ENTRY(v4_flush_user_cache_range)
 #ifdef CONFIG_CPU_CP15
         mov     ip, #0
-        mcreq   p15, 0, ip, c7, c7, 0           @ flush ID cache
+        mcr     p15, 0, ip, c7, c7, 0           @ flush ID cache
         mov     pc, lr
 #else
         /* FALLTHROUGH */
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index a5a4b2bc42ba..2ac37372ef52 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -48,7 +48,7 @@ static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
 static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
 
-static DEFINE_PER_CPU(atomic64_t, active_asids);
+DEFINE_PER_CPU(atomic64_t, active_asids);
 static DEFINE_PER_CPU(u64, reserved_asids);
 static cpumask_t tlb_flush_pending;
 
@@ -215,6 +215,7 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
         if (cpumask_test_and_clear_cpu(cpu, &tlb_flush_pending)) {
                 local_flush_bp_all();
                 local_flush_tlb_all();
+                dummy_flush_tlb_a15_erratum();
         }
 
         atomic64_set(&per_cpu(active_asids, cpu), asid);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e9db6b4bf65a..ef3e0f3aac96 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -823,16 +823,17 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
                 if (PageHighMem(page)) {
                         if (len + offset > PAGE_SIZE)
                                 len = PAGE_SIZE - offset;
-                        vaddr = kmap_high_get(page);
-                        if (vaddr) {
-                                vaddr += offset;
-                                op(vaddr, len, dir);
-                                kunmap_high(page);
-                        } else if (cache_is_vipt()) {
-                                /* unmapped pages might still be cached */
+
+                        if (cache_is_vipt_nonaliasing()) {
                                 vaddr = kmap_atomic(page);
                                 op(vaddr + offset, len, dir);
                                 kunmap_atomic(vaddr);
+                        } else {
+                                vaddr = kmap_high_get(page);
+                                if (vaddr) {
+                                        op(vaddr + offset, len, dir);
+                                        kunmap_high(page);
+                                }
                         }
                 } else {
                         vaddr = page_address(page) + offset;
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 1c8f7f564175..0d473cce501c 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -170,15 +170,18 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page)
         if (!PageHighMem(page)) {
                 __cpuc_flush_dcache_area(page_address(page), PAGE_SIZE);
         } else {
-                void *addr = kmap_high_get(page);
-                if (addr) {
-                        __cpuc_flush_dcache_area(addr, PAGE_SIZE);
-                        kunmap_high(page);
-                } else if (cache_is_vipt()) {
-                        /* unmapped pages might still be cached */
+                void *addr;
+
+                if (cache_is_vipt_nonaliasing()) {
                         addr = kmap_atomic(page);
                         __cpuc_flush_dcache_area(addr, PAGE_SIZE);
                         kunmap_atomic(addr);
+                } else {
+                        addr = kmap_high_get(page);
+                        if (addr) {
+                                __cpuc_flush_dcache_area(addr, PAGE_SIZE);
+                                kunmap_high(page);
+                        }
                 }
         }
 
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index c6d45c87540e..e0d8565671a6 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -34,6 +34,7 @@
 #include <asm/mach/pci.h>
 
 #include "mm.h"
+#include "tcm.h"
 
 /*
  * empty_zero_page is a special page that is used for
@@ -615,39 +616,60 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
         } while (pte++, addr += PAGE_SIZE, addr != end);
 }
 
-static void __init alloc_init_section(pud_t *pud, unsigned long addr,
-                                      unsigned long end, phys_addr_t phys,
-                                      const struct mem_type *type)
+static void __init map_init_section(pmd_t *pmd, unsigned long addr,
+                        unsigned long end, phys_addr_t phys,
+                        const struct mem_type *type)
 {
-        pmd_t *pmd = pmd_offset(pud, addr);
-
+#ifndef CONFIG_ARM_LPAE
         /*
-         * Try a section mapping - end, addr and phys must all be aligned
-         * to a section boundary.  Note that PMDs refer to the individual
-         * L1 entries, whereas PGDs refer to a group of L1 entries making
-         * up one logical pointer to an L2 table.
+         * In classic MMU format, puds and pmds are folded in to
+         * the pgds. pmd_offset gives the PGD entry. PGDs refer to a
+         * group of L1 entries making up one logical pointer to
+         * an L2 table (2MB), where as PMDs refer to the individual
+         * L1 entries (1MB). Hence increment to get the correct
+         * offset for odd 1MB sections.
+         * (See arch/arm/include/asm/pgtable-2level.h)
          */
-        if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0) {
-                pmd_t *p = pmd;
-
-#ifndef CONFIG_ARM_LPAE
-                if (addr & SECTION_SIZE)
-                        pmd++;
+        if (addr & SECTION_SIZE)
+                pmd++;
 #endif
+        do {
+                *pmd = __pmd(phys | type->prot_sect);
+                phys += SECTION_SIZE;
+        } while (pmd++, addr += SECTION_SIZE, addr != end);
 
-                do {
-                        *pmd = __pmd(phys | type->prot_sect);
-                        phys += SECTION_SIZE;
-                } while (pmd++, addr += SECTION_SIZE, addr != end);
+        flush_pmd_entry(pmd);
+}
 
-                flush_pmd_entry(p);
-        } else {
+static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
+                                      unsigned long end, phys_addr_t phys,
+                                      const struct mem_type *type)
+{
+        pmd_t *pmd = pmd_offset(pud, addr);
+        unsigned long next;
+
+        do {
                 /*
-                 * No need to loop; pte's aren't interested in the
-                 * individual L1 entries.
+                 * With LPAE, we must loop over to map
+                 * all the pmds for the given range.
                  */
-                alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type);
-        }
+                next = pmd_addr_end(addr, end);
+
+                /*
+                 * Try a section mapping - addr, next and phys must all be
+                 * aligned to a section boundary.
+                 */
+                if (type->prot_sect &&
+                                ((addr | next | phys) & ~SECTION_MASK) == 0) {
+                        map_init_section(pmd, addr, next, phys, type);
+                } else {
+                        alloc_init_pte(pmd, addr, next,
+                                                __phys_to_pfn(phys), type);
+                }
+
+                phys += next - addr;
+
+        } while (pmd++, addr = next, addr != end);
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
@@ -658,7 +680,7 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
 
         do {
                 next = pud_addr_end(addr, end);
-                alloc_init_section(pud, addr, next, phys, type);
+                alloc_init_pmd(pud, addr, next, phys, type);
                 phys += next - addr;
         } while (pud++, addr = next, addr != end);
 }
@@ -1273,6 +1295,7 @@ void __init paging_init(struct machine_desc *mdesc)
         dma_contiguous_remap();
         devicemaps_init(mdesc);
         kmap_init();
+        tcm_init();
 
         top_pmd = pmd_off_k(0xffff0000);
 
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index dc5de5d53f20..fde2d2a794cf 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -77,24 +77,27 @@ __arm740_setup:
         mcr     p15, 0, r0, c6, c0              @ set area 0, default
 
         ldr     r0, =(CONFIG_DRAM_BASE & 0xFFFFF000) @ base[31:12] of RAM
-        ldr     r1, =(CONFIG_DRAM_SIZE >> 12)   @ size of RAM (must be >= 4KB)
-        mov     r2, #10                         @ 11 is the minimum (4KB)
-1:      add     r2, r2, #1                      @ area size *= 2
-        mov     r1, r1, lsr #1
+        ldr     r3, =(CONFIG_DRAM_SIZE >> 12)   @ size of RAM (must be >= 4KB)
+        mov     r4, #10                         @ 11 is the minimum (4KB)
+1:      add     r4, r4, #1                      @ area size *= 2
+        movs    r3, r3, lsr #1
         bne     1b                              @ count not zero r-shift
-        orr     r0, r0, r2, lsl #1              @ the area register value
+        orr     r0, r0, r4, lsl #1              @ the area register value
         orr     r0, r0, #1                      @ set enable bit
         mcr     p15, 0, r0, c6, c1              @ set area 1, RAM
 
         ldr     r0, =(CONFIG_FLASH_MEM_BASE & 0xFFFFF000) @ base[31:12] of FLASH
-        ldr     r1, =(CONFIG_FLASH_SIZE >> 12)  @ size of FLASH (must be >= 4KB)
-        mov     r2, #10                         @ 11 is the minimum (4KB)
-1:      add     r2, r2, #1                      @ area size *= 2
-        mov     r1, r1, lsr #1
+        ldr     r3, =(CONFIG_FLASH_SIZE >> 12)  @ size of FLASH (must be >= 4KB)
+        cmp     r3, #0
+        moveq   r0, #0
+        beq     2f
+        mov     r4, #10                         @ 11 is the minimum (4KB)
+1:      add     r4, r4, #1                      @ area size *= 2
+        movs    r3, r3, lsr #1
         bne     1b                              @ count not zero r-shift
-        orr     r0, r0, r2, lsl #1              @ the area register value
+        orr     r0, r0, r4, lsl #1              @ the area register value
         orr     r0, r0, #1                      @ set enable bit
-        mcr     p15, 0, r0, c6, c2              @ set area 2, ROM/FLASH
+2:      mcr     p15, 0, r0, c6, c2              @ set area 2, ROM/FLASH
 
         mov     r0, #0x06
         mcr     p15, 0, r0, c2, c0              @ Region 1&2 cacheable
@@ -137,13 +140,14 @@ __arm740_proc_info:
         .long   0x41807400
         .long   0xfffffff0
         .long   0
+        .long   0
         b       __arm740_setup
         .long   cpu_arch_name
         .long   cpu_elf_name
-        .long   HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT
+        .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_26BIT
         .long   cpu_arm740_name
         .long   arm740_processor_functions
         .long   0
         .long   0
-        .long   v3_cache_fns                    @ cache model
+        .long   v4_cache_fns                    @ cache model
         .size   __arm740_proc_info, . - __arm740_proc_info
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 2c3b9421ab5e..2556cf1c2da1 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -387,7 +387,7 @@ ENTRY(cpu_arm920_set_pte_ext)
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl  cpu_arm920_suspend_size
 .equ    cpu_arm920_suspend_size, 4 * 3
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_arm920_do_suspend)
         stmfd   sp!, {r4 - r6, lr}
         mrc     p15, 0, r4, c13, c0, 0  @ PID
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index f1803f7e2972..344c8a548cc0 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -402,7 +402,7 @@ ENTRY(cpu_arm926_set_pte_ext)
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl  cpu_arm926_suspend_size
 .equ    cpu_arm926_suspend_size, 4 * 3
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_arm926_do_suspend)
         stmfd   sp!, {r4 - r6, lr}
         mrc     p15, 0, r4, c13, c0, 0  @ PID
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index 82f9cdc751d6..0b60dd3d742a 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -350,7 +350,7 @@ ENTRY(cpu_mohawk_set_pte_ext)
 
 .globl  cpu_mohawk_suspend_size
 .equ    cpu_mohawk_suspend_size, 4 * 6
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_mohawk_do_suspend)
         stmfd   sp!, {r4 - r9, lr}
         mrc     p14, 0, r4, c6, c0, 0   @ clock configuration, for turbo mode
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 3aa0da11fd84..d92dfd081429 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -172,7 +172,7 @@ ENTRY(cpu_sa1100_set_pte_ext)
 
 .globl  cpu_sa1100_suspend_size
 .equ    cpu_sa1100_suspend_size, 4 * 3
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_sa1100_do_suspend)
         stmfd   sp!, {r4 - r6, lr}
         mrc     p15, 0, r4, c3, c0, 0           @ domain ID
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
index 3e6210b4d6d4..054b491ff764 100644
--- a/arch/arm/mm/proc-syms.c
+++ b/arch/arm/mm/proc-syms.c
@@ -17,7 +17,9 @@
 
 #ifndef MULTI_CPU
 EXPORT_SYMBOL(cpu_dcache_clean_area);
+#ifdef CONFIG_MMU
 EXPORT_SYMBOL(cpu_set_pte_ext);
+#endif
 #else
 EXPORT_SYMBOL(processor);
 #endif
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index bcaaa8de9325..919405e20b80 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -80,12 +80,10 @@ ENTRY(cpu_v6_do_idle)
         mov     pc, lr
 
 ENTRY(cpu_v6_dcache_clean_area)
-#ifndef TLB_CAN_READ_FROM_L1_CACHE
 1:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, #D_CACHE_LINE_SIZE
         subs    r1, r1, #D_CACHE_LINE_SIZE
         bhi     1b
-#endif
         mov     pc, lr
 
 /*
@@ -138,7 +136,7 @@ ENTRY(cpu_v6_set_pte_ext)
 /* Suspend/resume support: taken from arch/arm/mach-s3c64xx/sleep.S */
 .globl  cpu_v6_suspend_size
 .equ    cpu_v6_suspend_size, 4 * 6
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_v6_do_suspend)
         stmfd   sp!, {r4 - r9, lr}
         mrc     p15, 0, r4, c13, c0, 0  @ FCSE/PID
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index 78f520bc0e99..9704097c450e 100644
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -110,7 +110,8 @@ ENTRY(cpu_v7_set_pte_ext)
  ARM(   str     r3, [r0, #2048]! )
  THUMB( add     r0, r0, #2048 )
  THUMB( str     r3, [r0] )
-        mcr     p15, 0, r0, c7, c10, 1          @ flush_pte
+        ALT_SMP(mov     pc,lr)
+        ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
 #endif
         mov     pc, lr
 ENDPROC(cpu_v7_set_pte_ext)
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 6ffd78c0f9ab..363027e811d6 100644
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -73,7 +73,8 @@ ENTRY(cpu_v7_set_pte_ext)
         tst     r3, #1 << (55 - 32)             @ L_PTE_DIRTY
         orreq   r2, #L_PTE_RDONLY
 1:      strd    r2, r3, [r0]
-        mcr     p15, 0, r0, c7, c10, 1          @ flush_pte
+        ALT_SMP(mov     pc, lr)
+        ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
 #endif
         mov     pc, lr
 ENDPROC(cpu_v7_set_pte_ext)
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 3a3c015f8d5c..2c73a7301ff7 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -75,14 +75,14 @@ ENTRY(cpu_v7_do_idle)
 ENDPROC(cpu_v7_do_idle)
 
 ENTRY(cpu_v7_dcache_clean_area)
-#ifndef TLB_CAN_READ_FROM_L1_CACHE
+        ALT_SMP(mov     pc, lr)                 @ MP extensions imply L1 PTW
+        ALT_UP(W(nop))
         dcache_line_size r2, r3
 1:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, r2
         subs    r1, r1, r2
         bhi     1b
         dsb
-#endif
         mov     pc, lr
 ENDPROC(cpu_v7_dcache_clean_area)
 
@@ -402,6 +402,8 @@ __v7_ca9mp_proc_info:
         __v7_proc __v7_ca9mp_setup
         .size   __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
 
+#endif  /* CONFIG_ARM_LPAE */
+
         /*
          * Marvell PJ4B processor.
          */
@@ -411,7 +413,6 @@ __v7_pj4b_proc_info:
         .long   0xfffffff0
         __v7_proc __v7_pj4b_setup
         .size   __v7_pj4b_proc_info, . - __v7_pj4b_proc_info
-#endif  /* CONFIG_ARM_LPAE */
 
         /*
          * ARM Ltd. Cortex A7 processor.
@@ -420,7 +421,7 @@ __v7_pj4b_proc_info:
 __v7_ca7mp_proc_info:
         .long   0x410fc070
         .long   0xff0ffff0
-        __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
+        __v7_proc __v7_ca7mp_setup
         .size   __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
 
         /*
@@ -430,10 +431,25 @@ __v7_ca7mp_proc_info:
 __v7_ca15mp_proc_info:
         .long   0x410fc0f0
         .long   0xff0ffff0
-        __v7_proc __v7_ca15mp_setup, hwcaps = HWCAP_IDIV
+        __v7_proc __v7_ca15mp_setup
         .size   __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info
 
         /*
+         * Qualcomm Inc. Krait processors.
+         */
+        .type   __krait_proc_info, #object
+__krait_proc_info:
+        .long   0x510f0400              @ Required ID value
+        .long   0xff0ffc00              @ Mask for ID
+        /*
+         * Some Krait processors don't indicate support for SDIV and UDIV
+         * instructions in the ARM instruction set, even though they actually
+         * do support them.
+         */
+        __v7_proc __v7_setup, hwcaps = HWCAP_IDIV
+        .size   __krait_proc_info, . - __krait_proc_info
+
+        /*
          * Match any ARMv7 processor core.
          */
         .type   __v7_proc_info, #object
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index eb93d6487f35..e8efd83b6f25 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -413,7 +413,7 @@ ENTRY(cpu_xsc3_set_pte_ext)
 
 .globl  cpu_xsc3_suspend_size
 .equ    cpu_xsc3_suspend_size, 4 * 6
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_xsc3_do_suspend)
         stmfd   sp!, {r4 - r9, lr}
         mrc     p14, 0, r4, c6, c0, 0   @ clock configuration, for turbo mode
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 25510361aa18..e766f889bfd6 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -528,7 +528,7 @@ ENTRY(cpu_xscale_set_pte_ext)
 
 .globl  cpu_xscale_suspend_size
 .equ    cpu_xscale_suspend_size, 4 * 6
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_xscale_do_suspend)
         stmfd   sp!, {r4 - r9, lr}
         mrc     p14, 0, r4, c6, c0, 0   @ clock configuration, for turbo mode
diff --git a/arch/arm/kernel/tcm.h b/arch/arm/mm/tcm.h
index 8015ad434a40..8015ad434a40 100644
--- a/arch/arm/kernel/tcm.h
+++ b/arch/arm/mm/tcm.h
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 6828ef6ce80e..a0bd8a755bdf 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -576,7 +576,7 @@ load_ind:
                         /* x = ((*(frame + k)) & 0xf) << 2; */
                         ctx->seen |= SEEN_X | SEEN_DATA | SEEN_CALL;
                         /* the interpreter should deal with the negative K */
-                        if (k < 0)
+                        if ((int)k < 0)
                                 return -1;
                         /* offset in r1: we might have to take the slow path */
                         emit_mov_i(r_off, k, ctx);
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 831e1fdfdb2f..a10297da122b 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -16,7 +16,7 @@
 # are merged into mainline or have been edited in the machine database
 # within the last 12 months.  References to machine_is_NAME() do not count!
 #
-# Last update: Thu Apr 26 08:44:23 2012
+# Last update: Fri Mar 22 17:24:50 2013
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -64,8 +64,8 @@ h7201			ARCH_H7201		H7201			161
 h7202                   ARCH_H7202              H7202                   162
 iq80321                 ARCH_IQ80321            IQ80321                 169
 ks8695                  ARCH_KS8695             KS8695                  180
-karo                    ARCH_KARO               KARO                    190
 smdk2410                ARCH_SMDK2410           SMDK2410                193
+ceiva                   ARCH_CEIVA              CEIVA                   200
 voiceblue               MACH_VOICEBLUE          VOICEBLUE               218
 h5400                   ARCH_H5400              H5400                   220
 omap_innovator          MACH_OMAP_INNOVATOR     OMAP_INNOVATOR          234
@@ -95,6 +95,7 @@ lpd7a400		MACH_LPD7A400		LPD7A400		389
 lpd7a404                MACH_LPD7A404           LPD7A404                390
 csb337                  MACH_CSB337             CSB337                  399
 mainstone               MACH_MAINSTONE          MAINSTONE               406
+lite300                 MACH_LITE300            LITE300                 408
 xcep                    MACH_XCEP               XCEP                    413
 arcom_vulcan            MACH_ARCOM_VULCAN       ARCOM_VULCAN            414
 nomadik                 MACH_NOMADIK            NOMADIK                 420
@@ -131,12 +132,14 @@ kb9200			MACH_KB9200		KB9200			612
 sx1                     MACH_SX1                SX1                     613
 ixdp465                 MACH_IXDP465            IXDP465                 618
 ixdp2351                MACH_IXDP2351           IXDP2351                619
+cm4008                  MACH_CM4008             CM4008                  624
 iq80332                 MACH_IQ80332            IQ80332                 629
 gtwx5715                MACH_GTWX5715           GTWX5715                641
 csb637                  MACH_CSB637             CSB637                  648
 n30                     MACH_N30                N30                     656
 nec_mp900               MACH_NEC_MP900          NEC_MP900               659
 kafa                    MACH_KAFA               KAFA                    662
+cm41xx                  MACH_CM41XX             CM41XX                  672
 ts72xx                  MACH_TS72XX             TS72XX                  673
 otom                    MACH_OTOM               OTOM                    680
 nexcoder_2440           MACH_NEXCODER_2440      NEXCODER_2440           681
@@ -149,6 +152,7 @@ colibri			MACH_COLIBRI		COLIBRI			729
 gateway7001             MACH_GATEWAY7001        GATEWAY7001             731
 pcm027                  MACH_PCM027             PCM027                  732
 anubis                  MACH_ANUBIS             ANUBIS                  734
+xboardgp8               MACH_XBOARDGP8          XBOARDGP8               742
 akita                   MACH_AKITA              AKITA                   744
 e330                    MACH_E330               E330                    753
 nokia770                MACH_NOKIA770           NOKIA770                755
@@ -157,9 +161,11 @@ edb9315a		MACH_EDB9315A		EDB9315A		772
 stargate2               MACH_STARGATE2          STARGATE2               774
 intelmote2              MACH_INTELMOTE2         INTELMOTE2              775
 trizeps4                MACH_TRIZEPS4           TRIZEPS4                776
+pnx4008                 MACH_PNX4008            PNX4008                 782
 cpuat91                 MACH_CPUAT91            CPUAT91                 787
 iq81340sc               MACH_IQ81340SC          IQ81340SC               799
 iq81340mc               MACH_IQ81340MC          IQ81340MC               801
+se4200                  MACH_SE4200             SE4200                  809
 micro9                  MACH_MICRO9             MICRO9                  811
 micro9l                 MACH_MICRO9L            MICRO9L                 812
 omap_palmte             MACH_OMAP_PALMTE        OMAP_PALMTE             817
@@ -178,6 +184,7 @@ mx21ads			MACH_MX21ADS		MX21ADS			851
 ams_delta               MACH_AMS_DELTA          AMS_DELTA               862
 nas100d                 MACH_NAS100D            NAS100D                 865
 magician                MACH_MAGICIAN           MAGICIAN                875
+cm4002                  MACH_CM4002             CM4002                  876
 nxdkn                   MACH_NXDKN              NXDKN                   880
 palmtx                  MACH_PALMTX             PALMTX                  885
 s3c2413                 MACH_S3C2413            S3C2413                 887
@@ -203,7 +210,6 @@ omap_fsample		MACH_OMAP_FSAMPLE	OMAP_FSAMPLE		970
 snapper_cl15            MACH_SNAPPER_CL15       SNAPPER_CL15            986
 omap_palmz71            MACH_OMAP_PALMZ71       OMAP_PALMZ71            993
 smdk2412                MACH_SMDK2412           SMDK2412                1009
-bkde303                 MACH_BKDE303            BKDE303                 1021
 smdk2413                MACH_SMDK2413           SMDK2413                1022
 aml_m5900               MACH_AML_M5900          AML_M5900               1024
 balloon3                MACH_BALLOON3           BALLOON3                1029
@@ -214,6 +220,7 @@ fsg			MACH_FSG		FSG			1091
 at91sam9260ek           MACH_AT91SAM9260EK      AT91SAM9260EK           1099
 glantank                MACH_GLANTANK           GLANTANK                1100
 n2100                   MACH_N2100              N2100                   1101
+im42xx                  MACH_IM42XX             IM42XX                  1105
 qt2410                  MACH_QT2410             QT2410                  1108
 kixrp435                MACH_KIXRP435           KIXRP435                1109
 cc9p9360dev             MACH_CC9P9360DEV        CC9P9360DEV             1114
@@ -247,6 +254,7 @@ csb726			MACH_CSB726		CSB726			1359
 davinci_dm6467_evm      MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM      1380
 davinci_dm355_evm       MACH_DAVINCI_DM355_EVM  DAVINCI_DM355_EVM       1381
 littleton               MACH_LITTLETON          LITTLETON               1388
+im4004                  MACH_IM4004             IM4004                  1400
 realview_pb11mp         MACH_REALVIEW_PB11MP    REALVIEW_PB11MP         1407
 mx27_3ds                MACH_MX27_3DS           MX27_3DS                1430
 halibut                 MACH_HALIBUT            HALIBUT                 1439
@@ -268,6 +276,7 @@ dns323			MACH_DNS323		DNS323			1542
 omap3_beagle            MACH_OMAP3_BEAGLE       OMAP3_BEAGLE            1546
 nokia_n810              MACH_NOKIA_N810         NOKIA_N810              1548
 pcm038                  MACH_PCM038             PCM038                  1551
+sg310                   MACH_SG310              SG310                   1564
 ts209                   MACH_TS209              TS209                   1565
 at91cap9adk             MACH_AT91CAP9ADK        AT91CAP9ADK             1566
 mx31moboard             MACH_MX31MOBOARD        MX31MOBOARD             1574
@@ -371,7 +380,6 @@ pcm043			MACH_PCM043		PCM043			2072
 sheevaplug              MACH_SHEEVAPLUG         SHEEVAPLUG              2097
 avengers_lite           MACH_AVENGERS_LITE      AVENGERS_LITE           2104
 mx51_babbage            MACH_MX51_BABBAGE       MX51_BABBAGE            2125
-tx37                    MACH_TX37               TX37                    2127
 rd78x00_masa            MACH_RD78X00_MASA       RD78X00_MASA            2135
 dm355_leopard           MACH_DM355_LEOPARD      DM355_LEOPARD           2138
 ts219                   MACH_TS219              TS219                   2139
@@ -380,12 +388,12 @@ 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
-tx25                    MACH_TX25               TX25                    2177
 omap3_torpedo           MACH_OMAP3_TORPEDO      OMAP3_TORPEDO           2178
 anw6410                 MACH_ANW6410            ANW6410                 2183
 imx27_visstrim_m10      MACH_IMX27_VISSTRIM_M10 IMX27_VISSTRIM_M10      2187
 portuxg20               MACH_PORTUXG20          PORTUXG20               2191
 smdkc110                MACH_SMDKC110           SMDKC110                2193
+cabespresso             MACH_CABESPRESSO        CABESPRESSO             2194
 omap3517evm             MACH_OMAP3517EVM        OMAP3517EVM             2200
 netspace_v2             MACH_NETSPACE_V2        NETSPACE_V2             2201
 netspace_max_v2         MACH_NETSPACE_MAX_V2    NETSPACE_MAX_V2         2202
@@ -404,6 +412,7 @@ bigdisk			MACH_BIGDISK		BIGDISK			2283
 at91sam9g20ek_2mmc      MACH_AT91SAM9G20EK_2MMC AT91SAM9G20EK_2MMC      2288
 bcmring                 MACH_BCMRING            BCMRING                 2289
 mahimahi                MACH_MAHIMAHI           MAHIMAHI                2304
+cerebric                MACH_CEREBRIC           CEREBRIC                2311
 smdk6442                MACH_SMDK6442           SMDK6442                2324
 openrd_base             MACH_OPENRD_BASE        OPENRD_BASE             2325
 devkit8000              MACH_DEVKIT8000         DEVKIT8000              2330
@@ -423,10 +432,10 @@ raumfeld_rc		MACH_RAUMFELD_RC	RAUMFELD_RC		2413
 raumfeld_connector      MACH_RAUMFELD_CONNECTOR RAUMFELD_CONNECTOR      2414
 raumfeld_speaker        MACH_RAUMFELD_SPEAKER   RAUMFELD_SPEAKER        2415
 tnetv107x               MACH_TNETV107X          TNETV107X               2418
-mx51_m2id               MACH_MX51_M2ID          MX51_M2ID               2428
 smdkv210                MACH_SMDKV210           SMDKV210                2456
 omap_zoom3              MACH_OMAP_ZOOM3         OMAP_ZOOM3              2464
 omap_3630sdp            MACH_OMAP_3630SDP       OMAP_3630SDP            2465
+cybook2440              MACH_CYBOOK2440         CYBOOK2440              2466
 smartq7                 MACH_SMARTQ7            SMARTQ7                 2479
 watson_efm_plugin       MACH_WATSON_EFM_PLUGIN  WATSON_EFM_PLUGIN       2491
 g4evm                   MACH_G4EVM              G4EVM                   2493
@@ -434,12 +443,10 @@ omapl138_hawkboard	MACH_OMAPL138_HAWKBOARD	OMAPL138_HAWKBOARD	2495
 ts41x                   MACH_TS41X              TS41X                   2502
 phy3250                 MACH_PHY3250            PHY3250                 2511
 mini6410                MACH_MINI6410           MINI6410                2520
-tx51                    MACH_TX51               TX51                    2529
 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
-pca101                  MACH_PCA101             PCA101                  2595
 capc7117                MACH_CAPC7117           CAPC7117                2612
 icontrol                MACH_ICONTROL           ICONTROL                2624
 gplugd                  MACH_GPLUGD             GPLUGD                  2625
@@ -465,6 +472,7 @@ igep0030		MACH_IGEP0030		IGEP0030		2717
 sbc3530                 MACH_SBC3530            SBC3530                 2722
 saarb                   MACH_SAARB              SAARB                   2727
 harmony                 MACH_HARMONY            HARMONY                 2731
+cybook_orizon           MACH_CYBOOK_ORIZON      CYBOOK_ORIZON           2733
 msm7x30_fluid           MACH_MSM7X30_FLUID      MSM7X30_FLUID           2741
 cm_t3517                MACH_CM_T3517           CM_T3517                2750
 wbd222                  MACH_WBD222             WBD222                  2753
@@ -480,10 +488,8 @@ eukrea_cpuimx35sd	MACH_EUKREA_CPUIMX35SD	EUKREA_CPUIMX35SD	2821
 eukrea_cpuimx51sd       MACH_EUKREA_CPUIMX51SD  EUKREA_CPUIMX51SD       2822
 eukrea_cpuimx51         MACH_EUKREA_CPUIMX51    EUKREA_CPUIMX51         2823
 smdkc210                MACH_SMDKC210           SMDKC210                2838
-pcaal1                  MACH_PCAAL1             PCAAL1                  2843
 t5325                   MACH_T5325              T5325                   2846
 income                  MACH_INCOME             INCOME                  2849
-mx257sx                 MACH_MX257SX            MX257SX                 2861
 goni                    MACH_GONI               GONI                    2862
 bv07                    MACH_BV07               BV07                    2882
 openrd_ultimate         MACH_OPENRD_ULTIMATE    OPENRD_ULTIMATE         2884
@@ -491,7 +497,6 @@ devixp			MACH_DEVIXP		DEVIXP			2885
 miccpt                  MACH_MICCPT             MICCPT                  2886
 mic256                  MACH_MIC256             MIC256                  2887
 u5500                   MACH_U5500              U5500                   2890
-pov15hd                 MACH_POV15HD            POV15HD                 2910
 linkstation_lschl       MACH_LINKSTATION_LSCHL  LINKSTATION_LSCHL       2913
 smdkv310                MACH_SMDKV310           SMDKV310                2925
 wm8505_7in_netbook      MACH_WM8505_7IN_NETBOOK WM8505_7IN_NETBOOK      2928
@@ -518,7 +523,6 @@ prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103
 paz00                   MACH_PAZ00              PAZ00                   3128
 acmenetusfoxg20         MACH_ACMENETUSFOXG20    ACMENETUSFOXG20         3129
 ag5evm                  MACH_AG5EVM             AG5EVM                  3189
-tsunagi                 MACH_TSUNAGI            TSUNAGI                 3197
 ics_if_voip             MACH_ICS_IF_VOIP        ICS_IF_VOIP             3206
 wlf_cragg_6410          MACH_WLF_CRAGG_6410     WLF_CRAGG_6410          3207
 trimslice               MACH_TRIMSLICE          TRIMSLICE               3209
@@ -529,8 +533,6 @@ msm8960_sim		MACH_MSM8960_SIM	MSM8960_SIM		3230
 msm8960_rumi3           MACH_MSM8960_RUMI3      MSM8960_RUMI3           3231
 gsia18s                 MACH_GSIA18S            GSIA18S                 3234
 mx53_loco               MACH_MX53_LOCO          MX53_LOCO               3273
-tx53                    MACH_TX53               TX53                    3279
-encore                  MACH_ENCORE             ENCORE                  3284
 wario                   MACH_WARIO              WARIO                   3288
 cm_t3730                MACH_CM_T3730           CM_T3730                3290
 hrefv60                 MACH_HREFV60            HREFV60                 3293
@@ -538,603 +540,24 @@ armlex4210		MACH_ARMLEX4210		ARMLEX4210		3361
 snowball                MACH_SNOWBALL           SNOWBALL                3363
 xilinx_ep107            MACH_XILINX_EP107       XILINX_EP107            3378
 nuri                    MACH_NURI               NURI                    3379
-wtplug                  MACH_WTPLUG             WTPLUG                  3412
-veridis_a300            MACH_VERIDIS_A300       VERIDIS_A300            3448
 origen                  MACH_ORIGEN             ORIGEN                  3455
-wm8650refboard          MACH_WM8650REFBOARD     WM8650REFBOARD          3472
-xarina                  MACH_XARINA             XARINA                  3476
-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
-dma210u                 MACH_DMA210U            DMA210U                 3495
-em_t3                   MACH_EM_T3              EM_T3                   3496
-htx3250                 MACH_HTX3250            HTX3250                 3497
-g50                     MACH_G50                G50                     3498
-eco5                    MACH_ECO5               ECO5                    3499
-wintergrasp             MACH_WINTERGRASP        WINTERGRASP             3500
-puro                    MACH_PURO               PURO                    3501
-shooter_k               MACH_SHOOTER_K          SHOOTER_K               3502
 nspire                  MACH_NSPIRE             NSPIRE                  3503
-mickxx                  MACH_MICKXX             MICKXX                  3504
-lxmb                    MACH_LXMB               LXMB                    3505
-adam                    MACH_ADAM               ADAM                    3507
-b1004                   MACH_B1004              B1004                   3508
-oboea                   MACH_OBOEA              OBOEA                   3509
-a1015                   MACH_A1015              A1015                   3510
-robin_vbdt30            MACH_ROBIN_VBDT30       ROBIN_VBDT30            3511
-tegra_enterprise        MACH_TEGRA_ENTERPRISE   TEGRA_ENTERPRISE        3512
-rfl108200_mk10          MACH_RFL108200_MK10     RFL108200_MK10          3513
-rfl108300_mk16          MACH_RFL108300_MK16     RFL108300_MK16          3514
-rover_v7                MACH_ROVER_V7           ROVER_V7                3515
-miphone                 MACH_MIPHONE            MIPHONE                 3516
-femtobts                MACH_FEMTOBTS           FEMTOBTS                3517
-monopoli                MACH_MONOPOLI           MONOPOLI                3518
-boss                    MACH_BOSS               BOSS                    3519
-davinci_dm368_vtam      MACH_DAVINCI_DM368_VTAM DAVINCI_DM368_VTAM      3520
-clcon                   MACH_CLCON              CLCON                   3521
 nokia_rm696             MACH_NOKIA_RM696        NOKIA_RM696             3522
-tahiti                  MACH_TAHITI             TAHITI                  3523
-fighter                 MACH_FIGHTER            FIGHTER                 3524
-sgh_i710                MACH_SGH_I710           SGH_I710                3525
-integreproscb           MACH_INTEGREPROSCB      INTEGREPROSCB           3526
-monza                   MACH_MONZA              MONZA                   3527
-calimain                MACH_CALIMAIN           CALIMAIN                3528
-mx6q_sabreauto          MACH_MX6Q_SABREAUTO     MX6Q_SABREAUTO          3529
-gma01x                  MACH_GMA01X             GMA01X                  3530
-sbc51                   MACH_SBC51              SBC51                   3531
-fit                     MACH_FIT                FIT                     3532
-steelhead               MACH_STEELHEAD          STEELHEAD               3533
-panther                 MACH_PANTHER            PANTHER                 3534
-msm8960_liquid          MACH_MSM8960_LIQUID     MSM8960_LIQUID          3535
-lexikonct               MACH_LEXIKONCT          LEXIKONCT               3536
-ns2816_stb              MACH_NS2816_STB         NS2816_STB              3537
-sei_mm2_lpc3250         MACH_SEI_MM2_LPC3250    SEI_MM2_LPC3250         3538
-cmimx53                 MACH_CMIMX53            CMIMX53                 3539
-sandwich                MACH_SANDWICH           SANDWICH                3540
-chief                   MACH_CHIEF              CHIEF                   3541
-pogo_e02                MACH_POGO_E02           POGO_E02                3542
 mikrap_x168             MACH_MIKRAP_X168        MIKRAP_X168             3543
-htcmozart               MACH_HTCMOZART          HTCMOZART               3544
-htcgold                 MACH_HTCGOLD            HTCGOLD                 3545
-mt72xx                  MACH_MT72XX             MT72XX                  3546
-mx51_ivy                MACH_MX51_IVY           MX51_IVY                3547
-mx51_lvd                MACH_MX51_LVD           MX51_LVD                3548
-omap3_wiser2            MACH_OMAP3_WISER2       OMAP3_WISER2            3549
-dreamplug               MACH_DREAMPLUG          DREAMPLUG               3550
-cobas_c_111             MACH_COBAS_C_111        COBAS_C_111             3551
-cobas_u_411             MACH_COBAS_U_411        COBAS_U_411             3552
-hssd                    MACH_HSSD               HSSD                    3553
-iom35x                  MACH_IOM35X             IOM35X                  3554
-psom_omap               MACH_PSOM_OMAP          PSOM_OMAP               3555
-iphone_2g               MACH_IPHONE_2G          IPHONE_2G               3556
-iphone_3g               MACH_IPHONE_3G          IPHONE_3G               3557
-ipod_touch_1g           MACH_IPOD_TOUCH_1G      IPOD_TOUCH_1G           3558
-pharos_tpc              MACH_PHAROS_TPC         PHAROS_TPC              3559
-mx53_hydra              MACH_MX53_HYDRA         MX53_HYDRA              3560
-ns2816_dev_board        MACH_NS2816_DEV_BOARD   NS2816_DEV_BOARD        3561
-iphone_3gs              MACH_IPHONE_3GS         IPHONE_3GS              3562
-iphone_4                MACH_IPHONE_4           IPHONE_4                3563
-ipod_touch_4g           MACH_IPOD_TOUCH_4G      IPOD_TOUCH_4G           3564
-dragon_e1100            MACH_DRAGON_E1100       DRAGON_E1100            3565
-topside                 MACH_TOPSIDE            TOPSIDE                 3566
-irisiii                 MACH_IRISIII            IRISIII                 3567
 deto_macarm9            MACH_DETO_MACARM9       DETO_MACARM9            3568
-eti_d1                  MACH_ETI_D1             ETI_D1                  3569
-som3530sdk              MACH_SOM3530SDK         SOM3530SDK              3570
-oc_engine               MACH_OC_ENGINE          OC_ENGINE               3571
-apq8064_sim             MACH_APQ8064_SIM        APQ8064_SIM             3572
-alps                    MACH_ALPS               ALPS                    3575
-tny_t3730               MACH_TNY_T3730          TNY_T3730               3576
-geryon_nfe              MACH_GERYON_NFE         GERYON_NFE              3577
-ns2816_ref_board        MACH_NS2816_REF_BOARD   NS2816_REF_BOARD        3578
-silverstone             MACH_SILVERSTONE        SILVERSTONE             3579
-mtt2440                 MACH_MTT2440            MTT2440                 3580
-ynicdb                  MACH_YNICDB             YNICDB                  3581
-bct                     MACH_BCT                BCT                     3582
-tuscan                  MACH_TUSCAN             TUSCAN                  3583
-xbt_sam9g45             MACH_XBT_SAM9G45        XBT_SAM9G45             3584
-enbw_cmc                MACH_ENBW_CMC           ENBW_CMC                3585
-ch104mx257              MACH_CH104MX257         CH104MX257              3587
-openpri                 MACH_OPENPRI            OPENPRI                 3588
-am335xevm               MACH_AM335XEVM          AM335XEVM               3589
-picodmb                 MACH_PICODMB            PICODMB                 3590
-waluigi                 MACH_WALUIGI            WALUIGI                 3591
-punicag7                MACH_PUNICAG7           PUNICAG7                3592
-ipad_1g                 MACH_IPAD_1G            IPAD_1G                 3593
-appletv_2g              MACH_APPLETV_2G         APPLETV_2G              3594
-mach_ecog45             MACH_MACH_ECOG45        MACH_ECOG45             3595
-ait_cam_enc_4xx         MACH_AIT_CAM_ENC_4XX    AIT_CAM_ENC_4XX         3596
-runnymede               MACH_RUNNYMEDE          RUNNYMEDE               3597
-play                    MACH_PLAY               PLAY                    3598
-hw90260                 MACH_HW90260            HW90260                 3599
-tagh                    MACH_TAGH               TAGH                    3600
-filbert                 MACH_FILBERT            FILBERT                 3601
-getinge_netcomv3        MACH_GETINGE_NETCOMV3   GETINGE_NETCOMV3        3602
-cw20                    MACH_CW20               CW20                    3603
-cinema                  MACH_CINEMA             CINEMA                  3604
-cinema_tea              MACH_CINEMA_TEA         CINEMA_TEA              3605
-cinema_coffee           MACH_CINEMA_COFFEE      CINEMA_COFFEE           3606
-cinema_juice            MACH_CINEMA_JUICE       CINEMA_JUICE            3607
-mx53_mirage2            MACH_MX53_MIRAGE2       MX53_MIRAGE2            3609
-mx53_efikasb            MACH_MX53_EFIKASB       MX53_EFIKASB            3610
-stm_b2000               MACH_STM_B2000          STM_B2000               3612
 m28evk                  MACH_M28EVK             M28EVK                  3613
-pda                     MACH_PDA                PDA                     3614
-meraki_mr58             MACH_MERAKI_MR58        MERAKI_MR58             3615
 kota2                   MACH_KOTA2              KOTA2                   3616
-letcool                 MACH_LETCOOL            LETCOOL                 3617
-mx27iat                 MACH_MX27IAT            MX27IAT                 3618
-apollo_td               MACH_APOLLO_TD          APOLLO_TD               3619
-arena                   MACH_ARENA              ARENA                   3620
-gsngateway              MACH_GSNGATEWAY         GSNGATEWAY              3621
-lf2000                  MACH_LF2000             LF2000                  3622
 bonito                  MACH_BONITO             BONITO                  3623
-asymptote               MACH_ASYMPTOTE          ASYMPTOTE               3624
-bst2brd                 MACH_BST2BRD            BST2BRD                 3625
-tx335s                  MACH_TX335S             TX335S                  3626
-pelco_tesla             MACH_PELCO_TESLA        PELCO_TESLA             3627
-rrhtestplat             MACH_RRHTESTPLAT        RRHTESTPLAT             3628
-vidtonic_pro            MACH_VIDTONIC_PRO       VIDTONIC_PRO            3629
-pl_apollo               MACH_PL_APOLLO          PL_APOLLO               3630
-pl_phoenix              MACH_PL_PHOENIX         PL_PHOENIX              3631
-m28cu3                  MACH_M28CU3             M28CU3                  3632
-vvbox_hd                MACH_VVBOX_HD           VVBOX_HD                3633
-coreware_sam9260_       MACH_COREWARE_SAM9260_  COREWARE_SAM9260_       3634
-marmaduke               MACH_MARMADUKE          MARMADUKE               3635
-amg_xlcore_camera       MACH_AMG_XLCORE_CAMERA  AMG_XLCORE_CAMERA       3636
 omap3_egf               MACH_OMAP3_EGF          OMAP3_EGF               3637
 smdk4212                MACH_SMDK4212           SMDK4212                3638
-dnp9200                 MACH_DNP9200            DNP9200                 3639
-tf101                   MACH_TF101              TF101                   3640
-omap3silvio             MACH_OMAP3SILVIO        OMAP3SILVIO             3641
-picasso2                MACH_PICASSO2           PICASSO2                3642
-vangogh2                MACH_VANGOGH2           VANGOGH2                3643
-olpc_xo_1_75            MACH_OLPC_XO_1_75       OLPC_XO_1_75            3644
-gx400                   MACH_GX400              GX400                   3645
-gs300                   MACH_GS300              GS300                   3646
-acer_a9                 MACH_ACER_A9            ACER_A9                 3647
-vivow_evm               MACH_VIVOW_EVM          VIVOW_EVM               3648
-veloce_cxq              MACH_VELOCE_CXQ         VELOCE_CXQ              3649
-veloce_cxm              MACH_VELOCE_CXM         VELOCE_CXM              3650
-p1852                   MACH_P1852              P1852                   3651
-naxy100                 MACH_NAXY100            NAXY100                 3652
-taishan                 MACH_TAISHAN            TAISHAN                 3653
-touchlink               MACH_TOUCHLINK          TOUCHLINK               3654
-stm32f103ze             MACH_STM32F103ZE        STM32F103ZE             3655
-mcx                     MACH_MCX                MCX                     3656
-stm_nmhdk_fli7610       MACH_STM_NMHDK_FLI7610  STM_NMHDK_FLI7610       3657
-top28x                  MACH_TOP28X             TOP28X                  3658
-okl4vp_microvisor       MACH_OKL4VP_MICROVISOR  OKL4VP_MICROVISOR       3659
-pop                     MACH_POP                POP                     3660
-layer                   MACH_LAYER              LAYER                   3661
-trondheim               MACH_TRONDHEIM          TRONDHEIM               3662
-eva                     MACH_EVA                EVA                     3663
-trust_taurus            MACH_TRUST_TAURUS       TRUST_TAURUS            3664
-ns2816_huashan          MACH_NS2816_HUASHAN     NS2816_HUASHAN          3665
-ns2816_yangcheng        MACH_NS2816_YANGCHENG   NS2816_YANGCHENG        3666
-p852                    MACH_P852               P852                    3667
-flea3                   MACH_FLEA3              FLEA3                   3668
-bowfin                  MACH_BOWFIN             BOWFIN                  3669
-mv88de3100              MACH_MV88DE3100         MV88DE3100              3670
-pia_am35x               MACH_PIA_AM35X          PIA_AM35X               3671
-cedar                   MACH_CEDAR              CEDAR                   3672
-picasso_e               MACH_PICASSO_E          PICASSO_E               3673
-samsung_e60             MACH_SAMSUNG_E60        SAMSUNG_E60             3674
-sdvr_mini               MACH_SDVR_MINI          SDVR_MINI               3676
-omap3_ij3k              MACH_OMAP3_IJ3K         OMAP3_IJ3K              3677
-modasmc1                MACH_MODASMC1           MODASMC1                3678
-apq8064_rumi3           MACH_APQ8064_RUMI3      APQ8064_RUMI3           3679
-matrix506               MACH_MATRIX506          MATRIX506               3680
-msm9615_mtp             MACH_MSM9615_MTP        MSM9615_MTP             3681
-dm36x_spawndc           MACH_DM36X_SPAWNDC      DM36X_SPAWNDC           3682
-sff792                  MACH_SFF792             SFF792                  3683
-am335xiaevm             MACH_AM335XIAEVM        AM335XIAEVM             3684
-g3c2440                 MACH_G3C2440            G3C2440                 3685
-tion270                 MACH_TION270            TION270                 3686
-w22q7arm02              MACH_W22Q7ARM02         W22Q7ARM02              3687
-omap_cat                MACH_OMAP_CAT           OMAP_CAT                3688
-at91sam9n12ek           MACH_AT91SAM9N12EK      AT91SAM9N12EK           3689
-morrison                MACH_MORRISON           MORRISON                3690
-svdu                    MACH_SVDU               SVDU                    3691
-lpp01                   MACH_LPP01              LPP01                   3692
-ubc283                  MACH_UBC283             UBC283                  3693
-zeppelin                MACH_ZEPPELIN           ZEPPELIN                3694
-motus                   MACH_MOTUS              MOTUS                   3695
-neomainboard            MACH_NEOMAINBOARD       NEOMAINBOARD            3696
-devkit3250              MACH_DEVKIT3250         DEVKIT3250              3697
-devkit7000              MACH_DEVKIT7000         DEVKIT7000              3698
-fmc_uic                 MACH_FMC_UIC            FMC_UIC                 3699
-fmc_dcm                 MACH_FMC_DCM            FMC_DCM                 3700
-batwm                   MACH_BATWM              BATWM                   3701
-atlas6cb                MACH_ATLAS6CB           ATLAS6CB                3702
-blue                    MACH_BLUE               BLUE                    3705
-colorado                MACH_COLORADO           COLORADO                3706
-popc                    MACH_POPC               POPC                    3707
-promwad_jade            MACH_PROMWAD_JADE       PROMWAD_JADE            3708
-amp                     MACH_AMP                AMP                     3709
-gnet_amp                MACH_GNET_AMP           GNET_AMP                3710
-toques                  MACH_TOQUES             TOQUES                  3711
 apx4devkit              MACH_APX4DEVKIT         APX4DEVKIT              3712
-dct_storm               MACH_DCT_STORM          DCT_STORM               3713
-owl                     MACH_OWL                OWL                     3715
-cogent_csb1741          MACH_COGENT_CSB1741     COGENT_CSB1741          3716
-adillustra610           MACH_ADILLUSTRA610      ADILLUSTRA610           3718
-ecafe_na04              MACH_ECAFE_NA04         ECAFE_NA04              3719
-popct                   MACH_POPCT              POPCT                   3720
-omap3_helena            MACH_OMAP3_HELENA       OMAP3_HELENA            3721
-ach                     MACH_ACH                ACH                     3722
-module_dtb              MACH_MODULE_DTB         MODULE_DTB              3723
-oslo_elisabeth          MACH_OSLO_ELISABETH     OSLO_ELISABETH          3725
-tt01                    MACH_TT01               TT01                    3726
-msm8930_cdp             MACH_MSM8930_CDP        MSM8930_CDP             3727
-msm8930_mtp             MACH_MSM8930_MTP        MSM8930_MTP             3728
-msm8930_fluid           MACH_MSM8930_FLUID      MSM8930_FLUID           3729
-ltu11                   MACH_LTU11              LTU11                   3730
-am1808_spawnco          MACH_AM1808_SPAWNCO     AM1808_SPAWNCO          3731
-flx6410                 MACH_FLX6410            FLX6410                 3732
-mx6q_qsb                MACH_MX6Q_QSB           MX6Q_QSB                3733
-mx53_plt424             MACH_MX53_PLT424        MX53_PLT424             3734
-jasmine                 MACH_JASMINE            JASMINE                 3735
-l138_owlboard_plus      MACH_L138_OWLBOARD_PLUS L138_OWLBOARD_PLUS      3736
-wr21                    MACH_WR21               WR21                    3737
-peaboy                  MACH_PEABOY             PEABOY                  3739
-mx28_plato              MACH_MX28_PLATO         MX28_PLATO              3740
-kacom2                  MACH_KACOM2             KACOM2                  3741
-slco                    MACH_SLCO               SLCO                    3742
-imx51pico               MACH_IMX51PICO          IMX51PICO               3743
-glink1                  MACH_GLINK1             GLINK1                  3744
-diamond                 MACH_DIAMOND            DIAMOND                 3745
-d9000                   MACH_D9000              D9000                   3746
-w5300e01                MACH_W5300E01           W5300E01                3747
-im6000                  MACH_IM6000             IM6000                  3748
-mx51_fred51             MACH_MX51_FRED51        MX51_FRED51             3749
-stm32f2                 MACH_STM32F2            STM32F2                 3750
-ville                   MACH_VILLE              VILLE                   3751
-ptip_murnau             MACH_PTIP_MURNAU        PTIP_MURNAU             3752
-ptip_classic            MACH_PTIP_CLASSIC       PTIP_CLASSIC            3753
-mx53grb                 MACH_MX53GRB            MX53GRB                 3754
-gagarin                 MACH_GAGARIN            GAGARIN                 3755
-nas2big                 MACH_NAS2BIG            NAS2BIG                 3757
-superfemto              MACH_SUPERFEMTO         SUPERFEMTO              3758
-teufel                  MACH_TEUFEL             TEUFEL                  3759
-dinara                  MACH_DINARA             DINARA                  3760
-vanquish                MACH_VANQUISH           VANQUISH                3761
-zipabox1                MACH_ZIPABOX1           ZIPABOX1                3762
-u9540                   MACH_U9540              U9540                   3763
-jet                     MACH_JET                JET                     3764
 smdk4412                MACH_SMDK4412           SMDK4412                3765
-elite                   MACH_ELITE              ELITE                   3766
-spear320_hmi            MACH_SPEAR320_HMI       SPEAR320_HMI            3767
-ontario                 MACH_ONTARIO            ONTARIO                 3768
-mx6q_sabrelite          MACH_MX6Q_SABRELITE     MX6Q_SABRELITE          3769
-vc200                   MACH_VC200              VC200                   3770
-msm7625a_ffa            MACH_MSM7625A_FFA       MSM7625A_FFA            3771
-msm7625a_surf           MACH_MSM7625A_SURF      MSM7625A_SURF           3772
-benthossbp              MACH_BENTHOSSBP         BENTHOSSBP              3773
-smdk5210                MACH_SMDK5210           SMDK5210                3774
-empq2300                MACH_EMPQ2300           EMPQ2300                3775
-minipos                 MACH_MINIPOS            MINIPOS                 3776
-omap5_sevm              MACH_OMAP5_SEVM         OMAP5_SEVM              3777
-shelter                 MACH_SHELTER            SHELTER                 3778
-omap3_devkit8500        MACH_OMAP3_DEVKIT8500   OMAP3_DEVKIT8500        3779
-edgetd                  MACH_EDGETD             EDGETD                  3780
-copperyard              MACH_COPPERYARD         COPPERYARD              3781
-edge_u                  MACH_EDGE_U             EDGE_U                  3783
-edge_td                 MACH_EDGE_TD            EDGE_TD                 3784
-wdss                    MACH_WDSS               WDSS                    3785
-dl_pb25                 MACH_DL_PB25            DL_PB25                 3786
-dss11                   MACH_DSS11              DSS11                   3787
-cpa                     MACH_CPA                CPA                     3788
-aptp2000                MACH_APTP2000           APTP2000                3789
 marzen                  MACH_MARZEN             MARZEN                  3790
-st_turbine              MACH_ST_TURBINE         ST_TURBINE              3791
-gtl_it3300              MACH_GTL_IT3300         GTL_IT3300              3792
-mx6_mule                MACH_MX6_MULE           MX6_MULE                3793
-v7pxa_dt                MACH_V7PXA_DT           V7PXA_DT                3794
-v7mmp_dt                MACH_V7MMP_DT           V7MMP_DT                3795
-dragon7                 MACH_DRAGON7            DRAGON7                 3796
 krome                   MACH_KROME              KROME                   3797
-oratisdante             MACH_ORATISDANTE        ORATISDANTE             3798
-fathom                  MACH_FATHOM             FATHOM                  3799
-dns325                  MACH_DNS325             DNS325                  3800
-sarnen                  MACH_SARNEN             SARNEN                  3801
-ubisys_g1               MACH_UBISYS_G1          UBISYS_G1               3802
-mx53_pf1                MACH_MX53_PF1           MX53_PF1                3803
-asanti                  MACH_ASANTI             ASANTI                  3804
-volta                   MACH_VOLTA              VOLTA                   3805
-knight                  MACH_KNIGHT             KNIGHT                  3807
-beaglebone              MACH_BEAGLEBONE         BEAGLEBONE              3808
-becker                  MACH_BECKER             BECKER                  3809
-fc360                   MACH_FC360              FC360                   3810
-pmi2_xls                MACH_PMI2_XLS           PMI2_XLS                3811
-taranto                 MACH_TARANTO            TARANTO                 3812
-plutux                  MACH_PLUTUX             PLUTUX                  3813
-ipmp_medcom             MACH_IPMP_MEDCOM        IPMP_MEDCOM             3814
-absolut                 MACH_ABSOLUT            ABSOLUT                 3815
-awpb3                   MACH_AWPB3              AWPB3                   3816
-nfp32xx_dt              MACH_NFP32XX_DT         NFP32XX_DT              3817
-dl_pb53                 MACH_DL_PB53            DL_PB53                 3818
-acu_ii                  MACH_ACU_II             ACU_II                  3819
-avalon                  MACH_AVALON             AVALON                  3820
-sphinx                  MACH_SPHINX             SPHINX                  3821
-titan_t                 MACH_TITAN_T            TITAN_T                 3822
-harvest_boris           MACH_HARVEST_BORIS      HARVEST_BORIS           3823
-mach_msm7x30_m3s        MACH_MACH_MSM7X30_M3S   MACH_MSM7X30_M3S        3824
-smdk5250                MACH_SMDK5250           SMDK5250                3825
-imxt_lite               MACH_IMXT_LITE          IMXT_LITE               3826
-imxt_std                MACH_IMXT_STD           IMXT_STD                3827
-imxt_log                MACH_IMXT_LOG           IMXT_LOG                3828
-imxt_nav                MACH_IMXT_NAV           IMXT_NAV                3829
-imxt_full               MACH_IMXT_FULL          IMXT_FULL               3830
-ag09015                 MACH_AG09015            AG09015                 3831
-am3517_mt_ventoux       MACH_AM3517_MT_VENTOUX  AM3517_MT_VENTOUX       3832
-dp1arm9                 MACH_DP1ARM9            DP1ARM9                 3833
-picasso_m               MACH_PICASSO_M          PICASSO_M               3834
-video_gadget            MACH_VIDEO_GADGET       VIDEO_GADGET            3835
-mtt_om3x                MACH_MTT_OM3X           MTT_OM3X                3836
-mx6q_arm2               MACH_MX6Q_ARM2          MX6Q_ARM2               3837
-picosam9g45             MACH_PICOSAM9G45        PICOSAM9G45             3838
-vpm_dm365               MACH_VPM_DM365          VPM_DM365               3839
-bonfire                 MACH_BONFIRE            BONFIRE                 3840
-mt2p2d                  MACH_MT2P2D             MT2P2D                  3841
-sigpda01                MACH_SIGPDA01           SIGPDA01                3842
-cn27                    MACH_CN27               CN27                    3843
-mx25_cwtap              MACH_MX25_CWTAP         MX25_CWTAP              3844
-apf28                   MACH_APF28              APF28                   3845
-pelco_maxwell           MACH_PELCO_MAXWELL      PELCO_MAXWELL           3846
-ge_phoenix              MACH_GE_PHOENIX         GE_PHOENIX              3847
-empc_a500               MACH_EMPC_A500          EMPC_A500               3848
-ims_arm9                MACH_IMS_ARM9           IMS_ARM9                3849
-mini2416                MACH_MINI2416           MINI2416                3850
-mini2450                MACH_MINI2450           MINI2450                3851
-mini310                 MACH_MINI310            MINI310                 3852
-spear_hurricane         MACH_SPEAR_HURRICANE    SPEAR_HURRICANE         3853
-mt7208                  MACH_MT7208             MT7208                  3854
-lpc178x                 MACH_LPC178X            LPC178X                 3855
-farleys                 MACH_FARLEYS            FARLEYS                 3856
-efm32gg_dk3750          MACH_EFM32GG_DK3750     EFM32GG_DK3750          3857
-zeus_board              MACH_ZEUS_BOARD         ZEUS_BOARD              3858
-cc51                    MACH_CC51               CC51                    3859
-fxi_c210                MACH_FXI_C210           FXI_C210                3860
-msm8627_cdp             MACH_MSM8627_CDP        MSM8627_CDP             3861
-msm8627_mtp             MACH_MSM8627_MTP        MSM8627_MTP             3862
 armadillo800eva         MACH_ARMADILLO800EVA    ARMADILLO800EVA         3863
-primou                  MACH_PRIMOU             PRIMOU                  3864
-primoc                  MACH_PRIMOC             PRIMOC                  3865
-primoct                 MACH_PRIMOCT            PRIMOCT                 3866
-a9500                   MACH_A9500              A9500                   3867
-pluto                   MACH_PLUTO              PLUTO                   3869
-acfx100                 MACH_ACFX100            ACFX100                 3870
-msm8625_rumi3           MACH_MSM8625_RUMI3      MSM8625_RUMI3           3871
-valente                 MACH_VALENTE            VALENTE                 3872
-crfs_rfeye              MACH_CRFS_RFEYE         CRFS_RFEYE              3873
-rfeye                   MACH_RFEYE              RFEYE                   3874
-phidget_sbc3            MACH_PHIDGET_SBC3       PHIDGET_SBC3            3875
-tcw_mika                MACH_TCW_MIKA           TCW_MIKA                3876
-imx28_egf               MACH_IMX28_EGF          IMX28_EGF               3877
-valente_wx              MACH_VALENTE_WX         VALENTE_WX              3878
-huangshans              MACH_HUANGSHANS         HUANGSHANS              3879
-bosphorus1              MACH_BOSPHORUS1         BOSPHORUS1              3880
-prima                   MACH_PRIMA              PRIMA                   3881
-evita_ulk               MACH_EVITA_ULK          EVITA_ULK               3884
-merisc600               MACH_MERISC600          MERISC600               3885
-dolak                   MACH_DOLAK              DOLAK                   3886
-sbc53                   MACH_SBC53              SBC53                   3887
-elite_ulk               MACH_ELITE_ULK          ELITE_ULK               3888
-pov2                    MACH_POV2               POV2                    3889
-ipod_touch_2g           MACH_IPOD_TOUCH_2G      IPOD_TOUCH_2G           3890
-da850_pqab              MACH_DA850_PQAB         DA850_PQAB              3891
-fermi                   MACH_FERMI              FERMI                   3892
-ccardwmx28              MACH_CCARDWMX28         CCARDWMX28              3893
-ccardmx28               MACH_CCARDMX28          CCARDMX28               3894
-fs20_fcm2050            MACH_FS20_FCM2050       FS20_FCM2050            3895
-kinetis                 MACH_KINETIS            KINETIS                 3896
-kai                     MACH_KAI                KAI                     3897
-bcthb2                  MACH_BCTHB2             BCTHB2                  3898
-inels3_cu               MACH_INELS3_CU          INELS3_CU               3899
-da850_apollo            MACH_DA850_APOLLO       DA850_APOLLO            3901
-tracnas                 MACH_TRACNAS            TRACNAS                 3902
-mityarm335x             MACH_MITYARM335X        MITYARM335X             3903
-xcgz7x                  MACH_XCGZ7X             XCGZ7X                  3904
-cubox                   MACH_CUBOX              CUBOX                   3905
-terminator              MACH_TERMINATOR         TERMINATOR              3906
-eye03                   MACH_EYE03              EYE03                   3907
-kota3                   MACH_KOTA3              KOTA3                   3908
-pscpe                   MACH_PSCPE              PSCPE                   3910
-akt1100                 MACH_AKT1100            AKT1100                 3911
-pcaaxl2                 MACH_PCAAXL2            PCAAXL2                 3912
-primodd_ct              MACH_PRIMODD_CT         PRIMODD_CT              3913
-nsbc                    MACH_NSBC               NSBC                    3914
-meson2_skt              MACH_MESON2_SKT         MESON2_SKT              3915
-meson2_ref              MACH_MESON2_REF         MESON2_REF              3916
-ccardwmx28js            MACH_CCARDWMX28JS       CCARDWMX28JS            3917
-ccardmx28js             MACH_CCARDMX28JS        CCARDMX28JS             3918
-indico                  MACH_INDICO             INDICO                  3919
-msm8960dt               MACH_MSM8960DT          MSM8960DT               3920
-primods                 MACH_PRIMODS            PRIMODS                 3921
-beluga_m1388            MACH_BELUGA_M1388       BELUGA_M1388            3922
-primotd                 MACH_PRIMOTD            PRIMOTD                 3923
-varan_master            MACH_VARAN_MASTER       VARAN_MASTER            3924
-primodd                 MACH_PRIMODD            PRIMODD                 3925
-jetduo                  MACH_JETDUO             JETDUO                  3926
 mx53_umobo              MACH_MX53_UMOBO         MX53_UMOBO              3927
-trats                   MACH_TRATS              TRATS                   3928
-starcraft               MACH_STARCRAFT          STARCRAFT               3929
-qseven_tegra2           MACH_QSEVEN_TEGRA2      QSEVEN_TEGRA2           3930
-lichee_sun4i_devbd      MACH_LICHEE_SUN4I_DEVBD LICHEE_SUN4I_DEVBD      3931
-movenow                 MACH_MOVENOW            MOVENOW                 3932
-golf_u                  MACH_GOLF_U             GOLF_U                  3933
-msm7627a_evb            MACH_MSM7627A_EVB       MSM7627A_EVB            3934
-rambo                   MACH_RAMBO              RAMBO                   3935
-golfu                   MACH_GOLFU              GOLFU                   3936
-mango310                MACH_MANGO310           MANGO310                3937
-dns343                  MACH_DNS343             DNS343                  3938
-var_som_om44            MACH_VAR_SOM_OM44       VAR_SOM_OM44            3939
-naon                    MACH_NAON               NAON                    3940
-vp4000                  MACH_VP4000             VP4000                  3941
-impcard                 MACH_IMPCARD            IMPCARD                 3942
-smoovcam                MACH_SMOOVCAM           SMOOVCAM                3943
-cobham3725              MACH_COBHAM3725         COBHAM3725              3944
-cobham3730              MACH_COBHAM3730         COBHAM3730              3945
-cobham3703              MACH_COBHAM3703         COBHAM3703              3946
-quetzal                 MACH_QUETZAL            QUETZAL                 3947
-apq8064_cdp             MACH_APQ8064_CDP        APQ8064_CDP             3948
-apq8064_mtp             MACH_APQ8064_MTP        APQ8064_MTP             3949
-apq8064_fluid           MACH_APQ8064_FLUID      APQ8064_FLUID           3950
-apq8064_liquid          MACH_APQ8064_LIQUID     APQ8064_LIQUID          3951
-mango210                MACH_MANGO210           MANGO210                3952
-mango100                MACH_MANGO100           MANGO100                3953
-mango24                 MACH_MANGO24            MANGO24                 3954
-mango64                 MACH_MANGO64            MANGO64                 3955
-nsa320                  MACH_NSA320             NSA320                  3956
-elv_ccu2                MACH_ELV_CCU2           ELV_CCU2                3957
-triton_x00              MACH_TRITON_X00         TRITON_X00              3958
-triton_1500_2000        MACH_TRITON_1500_2000   TRITON_1500_2000        3959
-pogoplugv4              MACH_POGOPLUGV4         POGOPLUGV4              3960
-venus_cl                MACH_VENUS_CL           VENUS_CL                3961
-vulcano_g20             MACH_VULCANO_G20        VULCANO_G20             3962
-sgs_i9100               MACH_SGS_I9100          SGS_I9100               3963
-stsv2                   MACH_STSV2              STSV2                   3964
-csb1724                 MACH_CSB1724            CSB1724                 3965
-omapl138_lcdk           MACH_OMAPL138_LCDK      OMAPL138_LCDK           3966
-pvd_mx25                MACH_PVD_MX25           PVD_MX25                3968
-meson6_skt              MACH_MESON6_SKT         MESON6_SKT              3969
-meson6_ref              MACH_MESON6_REF         MESON6_REF              3970
-pxm                     MACH_PXM                PXM                     3971
-pogoplugv3              MACH_POGOPLUGV3         POGOPLUGV3              3973
-mlp89626                MACH_MLP89626           MLP89626                3974
-iomegahmndce            MACH_IOMEGAHMNDCE       IOMEGAHMNDCE            3975
-pogoplugv3pci           MACH_POGOPLUGV3PCI      POGOPLUGV3PCI           3976
-bntv250                 MACH_BNTV250            BNTV250                 3977
-mx53_qseven             MACH_MX53_QSEVEN        MX53_QSEVEN             3978
-gtl_it1100              MACH_GTL_IT1100         GTL_IT1100              3979
-mx6q_sabresd            MACH_MX6Q_SABRESD       MX6Q_SABRESD            3980
 mt4                     MACH_MT4                MT4                     3981
-jumbo_d                 MACH_JUMBO_D            JUMBO_D                 3982
-jumbo_i                 MACH_JUMBO_I            JUMBO_I                 3983
-fs20_dmp                MACH_FS20_DMP           FS20_DMP                3984
-dns320                  MACH_DNS320             DNS320                  3985
-mx28bacos               MACH_MX28BACOS          MX28BACOS               3986
-tl80                    MACH_TL80               TL80                    3987
-polatis_nic_1001        MACH_POLATIS_NIC_1001   POLATIS_NIC_1001        3988
-tely                    MACH_TELY               TELY                    3989
 u8520                   MACH_U8520              U8520                   3990
-manta                   MACH_MANTA              MANTA                   3991
-mpq8064_cdp             MACH_MPQ8064_CDP        MPQ8064_CDP             3993
-mpq8064_dtv             MACH_MPQ8064_DTV        MPQ8064_DTV             3995
-dm368som                MACH_DM368SOM           DM368SOM                3996
-gprisb2                 MACH_GPRISB2            GPRISB2                 3997
-chammid                 MACH_CHAMMID            CHAMMID                 3998
-seoul2                  MACH_SEOUL2             SEOUL2                  3999
-omap4_nooktablet        MACH_OMAP4_NOOKTABLET   OMAP4_NOOKTABLET        4000
-aalto                   MACH_AALTO              AALTO                   4001
-metro                   MACH_METRO              METRO                   4002
-cydm3730                MACH_CYDM3730           CYDM3730                4003
-tqma53                  MACH_TQMA53             TQMA53                  4004
-msm7627a_qrd3           MACH_MSM7627A_QRD3      MSM7627A_QRD3           4005
-mx28_canby              MACH_MX28_CANBY         MX28_CANBY              4006
-tiger                   MACH_TIGER              TIGER                   4007
-pcats_9307_type_a       MACH_PCATS_9307_TYPE_A  PCATS_9307_TYPE_A       4008
-pcats_9307_type_o       MACH_PCATS_9307_TYPE_O  PCATS_9307_TYPE_O       4009
-pcats_9307_type_r       MACH_PCATS_9307_TYPE_R  PCATS_9307_TYPE_R       4010
-streamplug              MACH_STREAMPLUG         STREAMPLUG              4011
-icechicken_dev          MACH_ICECHICKEN_DEV     ICECHICKEN_DEV          4012
-hedgehog                MACH_HEDGEHOG           HEDGEHOG                4013
-yusend_obc              MACH_YUSEND_OBC         YUSEND_OBC              4014
-imxninja                MACH_IMXNINJA           IMXNINJA                4015
-omap4_jarod             MACH_OMAP4_JAROD        OMAP4_JAROD             4016
-eco5_pk                 MACH_ECO5_PK            ECO5_PK                 4017
-qj2440                  MACH_QJ2440             QJ2440                  4018
-mx6q_mercury            MACH_MX6Q_MERCURY       MX6Q_MERCURY            4019
-cm6810                  MACH_CM6810             CM6810                  4020
-omap4_torpedo           MACH_OMAP4_TORPEDO      OMAP4_TORPEDO           4021
-nsa310                  MACH_NSA310             NSA310                  4022
-tmx536                  MACH_TMX536             TMX536                  4023
-ktt20                   MACH_KTT20              KTT20                   4024
-dragonix                MACH_DRAGONIX           DRAGONIX                4025
-lungching               MACH_LUNGCHING          LUNGCHING               4026
-bulogics                MACH_BULOGICS           BULOGICS                4027
-mx535_sx                MACH_MX535_SX           MX535_SX                4028
-ngui3250                MACH_NGUI3250           NGUI3250                4029
-salutec_dac             MACH_SALUTEC_DAC        SALUTEC_DAC             4030
-loco                    MACH_LOCO               LOCO                    4031
-ctera_plug_usi          MACH_CTERA_PLUG_USI     CTERA_PLUG_USI          4032
-scepter                 MACH_SCEPTER            SCEPTER                 4033
-sga                     MACH_SGA                SGA                     4034
-p_81_j5                 MACH_P_81_J5            P_81_J5                 4035
-p_81_o4                 MACH_P_81_O4            P_81_O4                 4036
-msm8625_surf            MACH_MSM8625_SURF       MSM8625_SURF            4037
-carallon_shark          MACH_CARALLON_SHARK     CARALLON_SHARK          4038
-ordog                   MACH_ORDOG              ORDOG                   4040
-puente_io               MACH_PUENTE_IO          PUENTE_IO               4041
-msm8625_evb             MACH_MSM8625_EVB        MSM8625_EVB             4042
-ev_am1707               MACH_EV_AM1707          EV_AM1707               4043
-ev_am1707e2             MACH_EV_AM1707E2        EV_AM1707E2             4044
-ev_am3517e2             MACH_EV_AM3517E2        EV_AM3517E2             4045
-calabria                MACH_CALABRIA           CALABRIA                4046
-ev_imx287               MACH_EV_IMX287          EV_IMX287               4047
-erau                    MACH_ERAU               ERAU                    4048
-sichuan                 MACH_SICHUAN            SICHUAN                 4049
-davinci_da850           MACH_DAVINCI_DA850      DAVINCI_DA850           4051
-omap138_trunarc         MACH_OMAP138_TRUNARC    OMAP138_TRUNARC         4052
-bcm4761                 MACH_BCM4761            BCM4761                 4053
-picasso_e2              MACH_PICASSO_E2         PICASSO_E2              4054
-picasso_mf              MACH_PICASSO_MF         PICASSO_MF              4055
-miro                    MACH_MIRO               MIRO                    4056
-at91sam9g20ewon3        MACH_AT91SAM9G20EWON3   AT91SAM9G20EWON3        4057
-yoyo                    MACH_YOYO               YOYO                    4058
-windjkl                 MACH_WINDJKL            WINDJKL                 4059
-monarudo                MACH_MONARUDO           MONARUDO                4060
-batan                   MACH_BATAN              BATAN                   4061
-tadao                   MACH_TADAO              TADAO                   4062
-baso                    MACH_BASO               BASO                    4063
-mahon                   MACH_MAHON              MAHON                   4064
-villec2                 MACH_VILLEC2            VILLEC2                 4065
-asi1230                 MACH_ASI1230            ASI1230                 4066
-alaska                  MACH_ALASKA             ALASKA                  4067
-swarco_shdsl2           MACH_SWARCO_SHDSL2      SWARCO_SHDSL2           4068
-oxrtu                   MACH_OXRTU              OXRTU                   4069
-omap5_panda             MACH_OMAP5_PANDA        OMAP5_PANDA             4070
-c8000                   MACH_C8000              C8000                   4072
-bje_display3_5          MACH_BJE_DISPLAY3_5     BJE_DISPLAY3_5          4073
-picomod7                MACH_PICOMOD7           PICOMOD7                4074
-picocom5                MACH_PICOCOM5           PICOCOM5                4075
-qblissa8                MACH_QBLISSA8           QBLISSA8                4076
-armstonea8              MACH_ARMSTONEA8         ARMSTONEA8              4077
-netdcu14                MACH_NETDCU14           NETDCU14                4078
-at91sam9x5_epiphan      MACH_AT91SAM9X5_EPIPHAN AT91SAM9X5_EPIPHAN      4079
-p2u                     MACH_P2U                P2U                     4080
-doris                   MACH_DORIS              DORIS                   4081
-j49                     MACH_J49                J49                     4082
-vdss2e                  MACH_VDSS2E             VDSS2E                  4083
-vc300                   MACH_VC300              VC300                   4084
-ns115_pad_test          MACH_NS115_PAD_TEST     NS115_PAD_TEST          4085
-ns115_pad_ref           MACH_NS115_PAD_REF      NS115_PAD_REF           4086
-ns115_phone_test        MACH_NS115_PHONE_TEST   NS115_PHONE_TEST        4087
-ns115_phone_ref         MACH_NS115_PHONE_REF    NS115_PHONE_REF         4088
-golfc                   MACH_GOLFC              GOLFC                   4089
-xerox_olympus           MACH_XEROX_OLYMPUS      XEROX_OLYMPUS           4090
-mx6sl_arm2              MACH_MX6SL_ARM2         MX6SL_ARM2              4091
-csb1701_csb1726         MACH_CSB1701_CSB1726    CSB1701_CSB1726         4092
-at91sam9xeek            MACH_AT91SAM9XEEK       AT91SAM9XEEK            4093
-ebv210                  MACH_EBV210             EBV210                  4094
-msm7627a_qrd7           MACH_MSM7627A_QRD7      MSM7627A_QRD7           4095
-svthin                  MACH_SVTHIN             SVTHIN                  4096
-duovero                 MACH_DUOVERO            DUOVERO                 4097
 chupacabra              MACH_CHUPACABRA         CHUPACABRA              4098
 scorpion                MACH_SCORPION           SCORPION                4099
 davinci_he_hmi10        MACH_DAVINCI_HE_HMI10   DAVINCI_HE_HMI10        4100
@@ -1157,7 +580,6 @@ tam335x			MACH_TAM335X		TAM335X			4116
 grouper                 MACH_GROUPER            GROUPER                 4117
 mpcsa21_9g20            MACH_MPCSA21_9G20       MPCSA21_9G20            4118
 m6u_cpu                 MACH_M6U_CPU            M6U_CPU                 4119
-davinci_dp10            MACH_DAVINCI_DP10       DAVINCI_DP10            4120
 ginkgo                  MACH_GINKGO             GINKGO                  4121
 cgt_qmx6                MACH_CGT_QMX6           CGT_QMX6                4122
 profpga                 MACH_PROFPGA            PROFPGA                 4123
@@ -1204,3 +626,384 @@ baileys			MACH_BAILEYS		BAILEYS			4169
 familybox               MACH_FAMILYBOX          FAMILYBOX               4170
 ensemble_mx35           MACH_ENSEMBLE_MX35      ENSEMBLE_MX35           4171
 sc_sps_1                MACH_SC_SPS_1           SC_SPS_1                4172
+ucsimply_sam9260        MACH_UCSIMPLY_SAM9260   UCSIMPLY_SAM9260        4173
+unicorn                 MACH_UNICORN            UNICORN                 4174
+m9g45a                  MACH_M9G45A             M9G45A                  4175
+mtwebif                 MACH_MTWEBIF            MTWEBIF                 4176
+playstone               MACH_PLAYSTONE          PLAYSTONE               4177
+chelsea                 MACH_CHELSEA            CHELSEA                 4178
+bayern                  MACH_BAYERN             BAYERN                  4179
+mitwo                   MACH_MITWO              MITWO                   4180
+mx25_noah               MACH_MX25_NOAH          MX25_NOAH               4181
+stm_b2020               MACH_STM_B2020          STM_B2020               4182
+annax_src               MACH_ANNAX_SRC          ANNAX_SRC               4183
+ionics_stratus          MACH_IONICS_STRATUS     IONICS_STRATUS          4184
+hugo                    MACH_HUGO               HUGO                    4185
+em300                   MACH_EM300              EM300                   4186
+mmp3_qseven             MACH_MMP3_QSEVEN        MMP3_QSEVEN             4187
+bosphorus2              MACH_BOSPHORUS2         BOSPHORUS2              4188
+tt2200                  MACH_TT2200             TT2200                  4189
+ocelot3                 MACH_OCELOT3            OCELOT3                 4190
+tek_cobra               MACH_TEK_COBRA          TEK_COBRA               4191
+protou                  MACH_PROTOU             PROTOU                  4192
+msm8625_evt             MACH_MSM8625_EVT        MSM8625_EVT             4193
+mx53_sellwood           MACH_MX53_SELLWOOD      MX53_SELLWOOD           4194
+somiq_am35              MACH_SOMIQ_AM35         SOMIQ_AM35              4195
+somiq_am37              MACH_SOMIQ_AM37         SOMIQ_AM37              4196
+k2_plc_cl               MACH_K2_PLC_CL          K2_PLC_CL               4197
+tc2                     MACH_TC2                TC2                     4198
+dulex_j                 MACH_DULEX_J            DULEX_J                 4199
+stm_b2044               MACH_STM_B2044          STM_B2044               4200
+deluxe_j                MACH_DELUXE_J           DELUXE_J                4201
+mango2443               MACH_MANGO2443          MANGO2443               4202
+cp2dcg                  MACH_CP2DCG             CP2DCG                  4203
+cp2dtg                  MACH_CP2DTG             CP2DTG                  4204
+cp2dug                  MACH_CP2DUG             CP2DUG                  4205
+var_som_am33            MACH_VAR_SOM_AM33       VAR_SOM_AM33            4206
+pepper                  MACH_PEPPER             PEPPER                  4207
+mango2450               MACH_MANGO2450          MANGO2450               4208
+valente_wx_c9           MACH_VALENTE_WX_C9      VALENTE_WX_C9           4209
+minitv                  MACH_MINITV             MINITV                  4210
+u8540                   MACH_U8540              U8540                   4211
+iv_atlas_i_z7e          MACH_IV_ATLAS_I_Z7E     IV_ATLAS_I_Z7E          4212
+mach_type_sky           MACH_MACH_TYPE_SKY      MACH_TYPE_SKY           4214
+bluesky                 MACH_BLUESKY            BLUESKY                 4215
+ngrouter                MACH_NGROUTER           NGROUTER                4216
+mx53_denetim            MACH_MX53_DENETIM       MX53_DENETIM            4217
+opal                    MACH_OPAL               OPAL                    4218
+gnet_us3gref            MACH_GNET_US3GREF       GNET_US3GREF            4219
+gnet_nc3g               MACH_GNET_NC3G          GNET_NC3G               4220
+gnet_ge3g               MACH_GNET_GE3G          GNET_GE3G               4221
+adp2                    MACH_ADP2               ADP2                    4222
+tqma28                  MACH_TQMA28             TQMA28                  4223
+kacom3                  MACH_KACOM3             KACOM3                  4224
+rrhdemo                 MACH_RRHDEMO            RRHDEMO                 4225
+protodug                MACH_PROTODUG           PROTODUG                4226
+lago                    MACH_LAGO               LAGO                    4227
+ktt30                   MACH_KTT30              KTT30                   4228
+ts43xx                  MACH_TS43XX             TS43XX                  4229
+mx6q_denso              MACH_MX6Q_DENSO         MX6Q_DENSO              4230
+comsat_gsmumts8         MACH_COMSAT_GSMUMTS8    COMSAT_GSMUMTS8         4231
+dreamx                  MACH_DREAMX             DREAMX                  4232
+thunderstonem           MACH_THUNDERSTONEM      THUNDERSTONEM           4233
+yoyopad                 MACH_YOYOPAD            YOYOPAD                 4234
+yoyopatient             MACH_YOYOPATIENT        YOYOPATIENT             4235
+a10l                    MACH_A10L               A10L                    4236
+mq60                    MACH_MQ60               MQ60                    4237
+linkstation_lsql        MACH_LINKSTATION_LSQL   LINKSTATION_LSQL        4238
+am3703gateway           MACH_AM3703GATEWAY      AM3703GATEWAY           4239
+accipiter               MACH_ACCIPITER          ACCIPITER               4240
+magnidug                MACH_MAGNIDUG           MAGNIDUG                4242
+hydra                   MACH_HYDRA              HYDRA                   4243
+sun3i                   MACH_SUN3I              SUN3I                   4244
+stm_b2078               MACH_STM_B2078          STM_B2078               4245
+at91sam9263deskv2       MACH_AT91SAM9263DESKV2  AT91SAM9263DESKV2       4246
+deluxe_r                MACH_DELUXE_R           DELUXE_R                4247
+p_98_v                  MACH_P_98_V             P_98_V                  4248
+p_98_c                  MACH_P_98_C             P_98_C                  4249
+davinci_am18xx_omn      MACH_DAVINCI_AM18XX_OMN DAVINCI_AM18XX_OMN      4250
+socfpga_cyclone5        MACH_SOCFPGA_CYCLONE5   SOCFPGA_CYCLONE5        4251
+cabatuin                MACH_CABATUIN           CABATUIN                4252
+yoyopad_ft              MACH_YOYOPAD_FT         YOYOPAD_FT              4253
+dan2400evb              MACH_DAN2400EVB         DAN2400EVB              4254
+dan3400evb              MACH_DAN3400EVB         DAN3400EVB              4255
+edm_sf_imx6             MACH_EDM_SF_IMX6        EDM_SF_IMX6             4256
+edm_cf_imx6             MACH_EDM_CF_IMX6        EDM_CF_IMX6             4257
+vpos3xx                 MACH_VPOS3XX            VPOS3XX                 4258
+vulcano_9x5             MACH_VULCANO_9X5        VULCANO_9X5             4259
+spmp8000                MACH_SPMP8000           SPMP8000                4260
+catalina                MACH_CATALINA           CATALINA                4261
+rd88f5181l_fe           MACH_RD88F5181L_FE      RD88F5181L_FE           4262
+mx535_mx                MACH_MX535_MX           MX535_MX                4263
+armadillo840            MACH_ARMADILLO840       ARMADILLO840            4264
+spc9000baseboard        MACH_SPC9000BASEBOARD   SPC9000BASEBOARD        4265
+iris                    MACH_IRIS               IRIS                    4266
+protodcg                MACH_PROTODCG           PROTODCG                4267
+palmtree                MACH_PALMTREE           PALMTREE                4268
+novena                  MACH_NOVENA             NOVENA                  4269
+ma_um                   MACH_MA_UM              MA_UM                   4270
+ma_am                   MACH_MA_AM              MA_AM                   4271
+ems348                  MACH_EMS348             EMS348                  4272
+cm_fx6                  MACH_CM_FX6             CM_FX6                  4273
+arndale                 MACH_ARNDALE            ARNDALE                 4274
+q5xr5                   MACH_Q5XR5              Q5XR5                   4275
+willow                  MACH_WILLOW             WILLOW                  4276
+omap3621_odyv3          MACH_OMAP3621_ODYV3     OMAP3621_ODYV3          4277
+omapl138_presonus       MACH_OMAPL138_PRESONUS  OMAPL138_PRESONUS       4278
+dvf99                   MACH_DVF99              DVF99                   4279
+impression_j            MACH_IMPRESSION_J       IMPRESSION_J            4280
+qblissa9                MACH_QBLISSA9           QBLISSA9                4281
+robin_heliview10        MACH_ROBIN_HELIVIEW10   ROBIN_HELIVIEW10        4282
+sun7i                   MACH_SUN7I              SUN7I                   4283
+mx6q_hdmidongle         MACH_MX6Q_HDMIDONGLE    MX6Q_HDMIDONGLE         4284
+mx6_sid2                MACH_MX6_SID2           MX6_SID2                4285
+helios_v3               MACH_HELIOS_V3          HELIOS_V3               4286
+helios_v4               MACH_HELIOS_V4          HELIOS_V4               4287
+q7_imx6                 MACH_Q7_IMX6            Q7_IMX6                 4288
+odroidx                 MACH_ODROIDX            ODROIDX                 4289
+robpro                  MACH_ROBPRO             ROBPRO                  4290
+research59if_mk1        MACH_RESEARCH59IF_MK1   RESEARCH59IF_MK1        4291
+bobsleigh               MACH_BOBSLEIGH          BOBSLEIGH               4292
+dcshgwt3                MACH_DCSHGWT3           DCSHGWT3                4293
+gld1018                 MACH_GLD1018            GLD1018                 4294
+ev10                    MACH_EV10               EV10                    4295
+nitrogen6x              MACH_NITROGEN6X         NITROGEN6X              4296
+p_107_bb                MACH_P_107_BB           P_107_BB                4297
+evita_utl               MACH_EVITA_UTL          EVITA_UTL               4298
+falconwing              MACH_FALCONWING         FALCONWING              4299
+dct3                    MACH_DCT3               DCT3                    4300
+cpx2e_cell              MACH_CPX2E_CELL         CPX2E_CELL              4301
+amiro                   MACH_AMIRO              AMIRO                   4302
+mx6q_brassboard         MACH_MX6Q_BRASSBOARD    MX6Q_BRASSBOARD         4303
+dalmore                 MACH_DALMORE            DALMORE                 4304
+omap3_portal7cp         MACH_OMAP3_PORTAL7CP    OMAP3_PORTAL7CP         4305
+tegra_pluto             MACH_TEGRA_PLUTO        TEGRA_PLUTO             4306
+mx6sl_evk               MACH_MX6SL_EVK          MX6SL_EVK               4307
+m7                      MACH_M7                 M7                      4308
+pxm2                    MACH_PXM2               PXM2                    4309
+haba_knx_lite           MACH_HABA_KNX_LITE      HABA_KNX_LITE           4310
+tai                     MACH_TAI                TAI                     4311
+prototd                 MACH_PROTOTD            PROTOTD                 4312
+dst_tonto               MACH_DST_TONTO          DST_TONTO               4313
+draco                   MACH_DRACO              DRACO                   4314
+dxr2                    MACH_DXR2               DXR2                    4315
+rut                     MACH_RUT                RUT                     4316
+am180x_wsc              MACH_AM180X_WSC         AM180X_WSC              4317
+deluxe_u                MACH_DELUXE_U           DELUXE_U                4318
+deluxe_ul               MACH_DELUXE_UL          DELUXE_UL               4319
+at91sam9260medths       MACH_AT91SAM9260MEDTHS  AT91SAM9260MEDTHS       4320
+matrix516               MACH_MATRIX516          MATRIX516               4321
+vid401x                 MACH_VID401X            VID401X                 4322
+helios_v5               MACH_HELIOS_V5          HELIOS_V5               4323
+playpaq2                MACH_PLAYPAQ2           PLAYPAQ2                4324
+igam                    MACH_IGAM               IGAM                    4325
+amico_i                 MACH_AMICO_I            AMICO_I                 4326
+amico_e                 MACH_AMICO_E            AMICO_E                 4327
+sentient_mm3_ck         MACH_SENTIENT_MM3_CK    SENTIENT_MM3_CK         4328
+smx6                    MACH_SMX6               SMX6                    4329
+pango                   MACH_PANGO              PANGO                   4330
+ns115_stick             MACH_NS115_STICK        NS115_STICK             4331
+bctrm3                  MACH_BCTRM3             BCTRM3                  4332
+doctorws                MACH_DOCTORWS           DOCTORWS                4333
+m2601                   MACH_M2601              M2601                   4334
+vgg1111                 MACH_VGG1111            VGG1111                 4337
+countach                MACH_COUNTACH           COUNTACH                4338
+visstrim_sm20           MACH_VISSTRIM_SM20      VISSTRIM_SM20           4339
+a639                    MACH_A639               A639                    4340
+spacemonkey             MACH_SPACEMONKEY        SPACEMONKEY             4341
+zpdu_stamp              MACH_ZPDU_STAMP         ZPDU_STAMP              4342
+htc_g7_clone            MACH_HTC_G7_CLONE       HTC_G7_CLONE            4343
+ft2080_corvus           MACH_FT2080_CORVUS      FT2080_CORVUS           4344
+fisland                 MACH_FISLAND            FISLAND                 4345
+zpdu                    MACH_ZPDU               ZPDU                    4346
+urt                     MACH_URT                URT                     4347
+conti_ovip              MACH_CONTI_OVIP         CONTI_OVIP              4348
+omapl138_nagra          MACH_OMAPL138_NAGRA     OMAPL138_NAGRA          4349
+da850_at3kp1            MACH_DA850_AT3KP1       DA850_AT3KP1            4350
+da850_at3kp2            MACH_DA850_AT3KP2       DA850_AT3KP2            4351
+surma                   MACH_SURMA              SURMA                   4352
+stm_b2092               MACH_STM_B2092          STM_B2092               4353
+mx535_ycr               MACH_MX535_YCR          MX535_YCR               4354
+m7_wl                   MACH_M7_WL              M7_WL                   4355
+m7_u                    MACH_M7_U               M7_U                    4356
+omap3_stndt_evm         MACH_OMAP3_STNDT_EVM    OMAP3_STNDT_EVM         4357
+m7_wlv                  MACH_M7_WLV             M7_WLV                  4358
+xam3517                 MACH_XAM3517            XAM3517                 4359
+a220                    MACH_A220               A220                    4360
+aclima_odie             MACH_ACLIMA_ODIE        ACLIMA_ODIE             4361
+vibble                  MACH_VIBBLE             VIBBLE                  4362
+k2_u                    MACH_K2_U               K2_U                    4363
+mx53_egf                MACH_MX53_EGF           MX53_EGF                4364
+novpek_imx53            MACH_NOVPEK_IMX53       NOVPEK_IMX53            4365
+novpek_imx6x            MACH_NOVPEK_IMX6X       NOVPEK_IMX6X            4366
+mx25_smartbox           MACH_MX25_SMARTBOX      MX25_SMARTBOX           4367
+eicg6410                MACH_EICG6410           EICG6410                4368
+picasso_e3              MACH_PICASSO_E3         PICASSO_E3              4369
+motonavigator           MACH_MOTONAVIGATOR      MOTONAVIGATOR           4370
+varioconnect2           MACH_VARIOCONNECT2      VARIOCONNECT2           4371
+deluxe_tw               MACH_DELUXE_TW          DELUXE_TW               4372
+kore3                   MACH_KORE3              KORE3                   4374
+mx6s_drs                MACH_MX6S_DRS           MX6S_DRS                4375
+cmimx6                  MACH_CMIMX6             CMIMX6                  4376
+roth                    MACH_ROTH               ROTH                    4377
+eq4ux                   MACH_EQ4UX              EQ4UX                   4378
+x1plus                  MACH_X1PLUS             X1PLUS                  4379
+modimx27                MACH_MODIMX27           MODIMX27                4380
+videon_hduac            MACH_VIDEON_HDUAC       VIDEON_HDUAC            4381
+blackbird               MACH_BLACKBIRD          BLACKBIRD               4382
+runmaster               MACH_RUNMASTER          RUNMASTER               4383
+ceres                   MACH_CERES              CERES                   4384
+nad435                  MACH_NAD435             NAD435                  4385
+ns115_proto_type        MACH_NS115_PROTO_TYPE   NS115_PROTO_TYPE        4386
+fs20_vcc                MACH_FS20_VCC           FS20_VCC                4387
+meson6tv_skt            MACH_MESON6TV_SKT       MESON6TV_SKT            4389
+keystone                MACH_KEYSTONE           KEYSTONE                4390
+pcm052                  MACH_PCM052             PCM052                  4391
+qrd_skud_prime          MACH_QRD_SKUD_PRIME     QRD_SKUD_PRIME          4393
+guf_santaro             MACH_GUF_SANTARO        GUF_SANTARO             4395
+sheepshead              MACH_SHEEPSHEAD         SHEEPSHEAD              4396
+mx6_iwg15m_mxm          MACH_MX6_IWG15M_MXM     MX6_IWG15M_MXM          4397
+mx6_iwg15m_q7           MACH_MX6_IWG15M_Q7      MX6_IWG15M_Q7           4398
+at91sam9263if8mic       MACH_AT91SAM9263IF8MIC  AT91SAM9263IF8MIC       4399
+marcopolo               MACH_MARCOPOLO          MARCOPOLO               4401
+mx535_sdcr              MACH_MX535_SDCR         MX535_SDCR              4402
+mx53_csb2733            MACH_MX53_CSB2733       MX53_CSB2733            4403
+diva                    MACH_DIVA               DIVA                    4404
+ncr_7744                MACH_NCR_7744           NCR_7744                4405
+macallan                MACH_MACALLAN           MACALLAN                4406
+wnr3500                 MACH_WNR3500            WNR3500                 4407
+pgavrf                  MACH_PGAVRF             PGAVRF                  4408
+helios_v6               MACH_HELIOS_V6          HELIOS_V6               4409
+lcct                    MACH_LCCT               LCCT                    4410
+csndug                  MACH_CSNDUG             CSNDUG                  4411
+wandboard_imx6          MACH_WANDBOARD_IMX6     WANDBOARD_IMX6          4412
+omap4_jet               MACH_OMAP4_JET          OMAP4_JET               4413
+tegra_roth              MACH_TEGRA_ROTH         TEGRA_ROTH              4414
+m7dcg                   MACH_M7DCG              M7DCG                   4415
+m7dug                   MACH_M7DUG              M7DUG                   4416
+m7dtg                   MACH_M7DTG              M7DTG                   4417
+ap42x                   MACH_AP42X              AP42X                   4418
+var_som_mx6             MACH_VAR_SOM_MX6        VAR_SOM_MX6             4419
+pdlu                    MACH_PDLU               PDLU                    4420
+hydrogen                MACH_HYDROGEN           HYDROGEN                4421
+npa211e                 MACH_NPA211E            NPA211E                 4422
+arcadia                 MACH_ARCADIA            ARCADIA                 4423
+arcadia_l               MACH_ARCADIA_L          ARCADIA_L               4424
+msm8930dt               MACH_MSM8930DT          MSM8930DT               4425
+ktam3874                MACH_KTAM3874           KTAM3874                4426
+cec4                    MACH_CEC4               CEC4                    4427
+ape6evm                 MACH_APE6EVM            APE6EVM                 4428
+tx6                     MACH_TX6                TX6                     4429
+cfa10037                MACH_CFA10037           CFA10037                4431
+ezp1000                 MACH_EZP1000            EZP1000                 4433
+wgr826v                 MACH_WGR826V            WGR826V                 4434
+exuma                   MACH_EXUMA              EXUMA                   4435
+fregate                 MACH_FREGATE            FREGATE                 4436
+osirisimx508            MACH_OSIRISIMX508       OSIRISIMX508            4437
+st_exigo                MACH_ST_EXIGO           ST_EXIGO                4438
+pismo                   MACH_PISMO              PISMO                   4439
+atc7                    MACH_ATC7               ATC7                    4440
+nspireclp               MACH_NSPIRECLP          NSPIRECLP               4441
+nspiretp                MACH_NSPIRETP           NSPIRETP                4442
+nspirecx                MACH_NSPIRECX           NSPIRECX                4443
+maya                    MACH_MAYA               MAYA                    4444
+wecct                   MACH_WECCT              WECCT                   4445
+m2s                     MACH_M2S                M2S                     4446
+msm8625q_evbd           MACH_MSM8625Q_EVBD      MSM8625Q_EVBD           4447
+tiny210                 MACH_TINY210            TINY210                 4448
+g3                      MACH_G3                 G3                      4449
+hurricane               MACH_HURRICANE          HURRICANE               4450
+mx6_pod                 MACH_MX6_POD            MX6_POD                 4451
+elondcn                 MACH_ELONDCN            ELONDCN                 4452
+cwmx535                 MACH_CWMX535            CWMX535                 4453
+m7_wlj                  MACH_M7_WLJ             M7_WLJ                  4454
+qsp_arm                 MACH_QSP_ARM            QSP_ARM                 4455
+msm8625q_skud           MACH_MSM8625Q_SKUD      MSM8625Q_SKUD           4456
+htcmondrian             MACH_HTCMONDRIAN        HTCMONDRIAN             4457
+watson_ead              MACH_WATSON_EAD         WATSON_EAD              4458
+mitwoa                  MACH_MITWOA             MITWOA                  4459
+omap3_wolverine         MACH_OMAP3_WOLVERINE    OMAP3_WOLVERINE         4460
+mapletree               MACH_MAPLETREE          MAPLETREE               4461
+msm8625_fih_sae         MACH_MSM8625_FIH_SAE    MSM8625_FIH_SAE         4462
+epc35                   MACH_EPC35              EPC35                   4463
+smartrtu                MACH_SMARTRTU           SMARTRTU                4464
+rcm101                  MACH_RCM101             RCM101                  4465
+amx_imx53_mxx           MACH_AMX_IMX53_MXX      AMX_IMX53_MXX           4466
+acer_a12                MACH_ACER_A12           ACER_A12                4470
+sbc6x                   MACH_SBC6X              SBC6X                   4471
+u2                      MACH_U2                 U2                      4472
+smdk4270                MACH_SMDK4270           SMDK4270                4473
+priscillag              MACH_PRISCILLAG         PRISCILLAG              4474
+priscillac              MACH_PRISCILLAC         PRISCILLAC              4475
+priscilla               MACH_PRISCILLA          PRISCILLA               4476
+innova_shpu_v2          MACH_INNOVA_SHPU_V2     INNOVA_SHPU_V2          4477
+mach_type_dep2410       MACH_MACH_TYPE_DEP2410  MACH_TYPE_DEP2410       4479
+bctre3                  MACH_BCTRE3             BCTRE3                  4480
+omap_m100               MACH_OMAP_M100          OMAP_M100               4481
+flo                     MACH_FLO                FLO                     4482
+nanobone                MACH_NANOBONE           NANOBONE                4483
+stm_b2105               MACH_STM_B2105          STM_B2105               4484
+omap4_bsc_bap_v3        MACH_OMAP4_BSC_BAP_V3   OMAP4_BSC_BAP_V3        4485
+ss1pam                  MACH_SS1PAM             SS1PAM                  4486
+primominiu              MACH_PRIMOMINIU         PRIMOMINIU              4488
+mrt_35hd_dualnas_e      MACH_MRT_35HD_DUALNAS_E MRT_35HD_DUALNAS_E      4489
+kiwi                    MACH_KIWI               KIWI                    4490
+hw90496                 MACH_HW90496            HW90496                 4491
+mep2440                 MACH_MEP2440            MEP2440                 4492
+colibri_t30             MACH_COLIBRI_T30        COLIBRI_T30             4493
+cwv1                    MACH_CWV1               CWV1                    4494
+nsa325                  MACH_NSA325             NSA325                  4495
+dpxmtc                  MACH_DPXMTC             DPXMTC                  4497
+tt_stuttgart            MACH_TT_STUTTGART       TT_STUTTGART            4498
+miranda_apcii           MACH_MIRANDA_APCII      MIRANDA_APCII           4499
+mx6q_moderox            MACH_MX6Q_MODEROX       MX6Q_MODEROX            4500
+mudskipper              MACH_MUDSKIPPER         MUDSKIPPER              4501
+urania                  MACH_URANIA             URANIA                  4502
+stm_b2112               MACH_STM_B2112          STM_B2112               4503
+mx6q_ats_phoenix        MACH_MX6Q_ATS_PHOENIX   MX6Q_ATS_PHOENIX        4505
+stm_b2116               MACH_STM_B2116          STM_B2116               4506
+mythology               MACH_MYTHOLOGY          MYTHOLOGY               4507
+fc360v1                 MACH_FC360V1            FC360V1                 4508
+gps_sensor              MACH_GPS_SENSOR         GPS_SENSOR              4509
+gazelle                 MACH_GAZELLE            GAZELLE                 4510
+mpq8064_dma             MACH_MPQ8064_DMA        MPQ8064_DMA             4511
+wems_asd01              MACH_WEMS_ASD01         WEMS_ASD01              4512
+apalis_t30              MACH_APALIS_T30         APALIS_T30              4513
+armstonea9              MACH_ARMSTONEA9         ARMSTONEA9              4515
+omap_blazetablet        MACH_OMAP_BLAZETABLET   OMAP_BLAZETABLET        4516
+ar6mxq                  MACH_AR6MXQ             AR6MXQ                  4517
+ar6mxs                  MACH_AR6MXS             AR6MXS                  4518
+gwventana               MACH_GWVENTANA          GWVENTANA               4520
+igep0033                MACH_IGEP0033           IGEP0033                4521
+h52c1_concerto          MACH_H52C1_CONCERTO     H52C1_CONCERTO          4524
+fcmbrd                  MACH_FCMBRD             FCMBRD                  4525
+pcaaxs1                 MACH_PCAAXS1            PCAAXS1                 4526
+ls_orca                 MACH_LS_ORCA            LS_ORCA                 4527
+pcm051lb                MACH_PCM051LB           PCM051LB                4528
+mx6s_lp507_gvci         MACH_MX6S_LP507_GVCI    MX6S_LP507_GVCI         4529
+dido                    MACH_DIDO               DIDO                    4530
+swarco_itc3_9g20        MACH_SWARCO_ITC3_9G20   SWARCO_ITC3_9G20        4531
+robo_roady              MACH_ROBO_ROADY         ROBO_ROADY              4532
+rskrza1                 MACH_RSKRZA1            RSKRZA1                 4533
+swarco_sid              MACH_SWARCO_SID         SWARCO_SID              4534
+mx6_iwg15s_sbc          MACH_MX6_IWG15S_SBC     MX6_IWG15S_SBC          4535
+mx6q_camaro             MACH_MX6Q_CAMARO        MX6Q_CAMARO             4536
+hb6mxs                  MACH_HB6MXS             HB6MXS                  4537
+lager                   MACH_LAGER              LAGER                   4538
+lp8x4x                  MACH_LP8X4X             LP8X4X                  4539
+tegratab7               MACH_TEGRATAB7          TEGRATAB7               4540
+andromeda               MACH_ANDROMEDA          ANDROMEDA               4541
+bootes                  MACH_BOOTES             BOOTES                  4542
+nethmi                  MACH_NETHMI             NETHMI                  4543
+tegratab                MACH_TEGRATAB           TEGRATAB                4544
+som5_evb                MACH_SOM5_EVB           SOM5_EVB                4545
+venaticorum             MACH_VENATICORUM        VENATICORUM             4546
+stm_b2110               MACH_STM_B2110          STM_B2110               4547
+elux_hathor             MACH_ELUX_HATHOR        ELUX_HATHOR             4548
+helios_v7               MACH_HELIOS_V7          HELIOS_V7               4549
+xc10v1                  MACH_XC10V1             XC10V1                  4550
+cp2u                    MACH_CP2U               CP2U                    4551
+iap_f                   MACH_IAP_F              IAP_F                   4552
+iap_g                   MACH_IAP_G              IAP_G                   4553
+aae                     MACH_AAE                AAE                     4554
+pegasus                 MACH_PEGASUS            PEGASUS                 4555
+cygnus                  MACH_CYGNUS             CYGNUS                  4556
+centaurus               MACH_CENTAURUS          CENTAURUS               4557
+msm8930_qrd8930         MACH_MSM8930_QRD8930    MSM8930_QRD8930         4558
+quby_tim                MACH_QUBY_TIM           QUBY_TIM                4559
+zedi3250a               MACH_ZEDI3250A          ZEDI3250A               4560
+grus                    MACH_GRUS               GRUS                    4561
+apollo3                 MACH_APOLLO3            APOLLO3                 4562
+cowon_r7                MACH_COWON_R7           COWON_R7                4563
+tonga3                  MACH_TONGA3             TONGA3                  4564
+p535                    MACH_P535               P535                    4565
+sa3874i                 MACH_SA3874I            SA3874I                 4566
+mx6_navico_com          MACH_MX6_NAVICO_COM     MX6_NAVICO_COM          4567
+proxmobil2              MACH_PROXMOBIL2         PROXMOBIL2              4568
+ubinux1                 MACH_UBINUX1            UBINUX1                 4569
+istos                   MACH_ISTOS              ISTOS                   4570
+benvolio4               MACH_BENVOLIO4          BENVOLIO4               4571
+eco5_bx2                MACH_ECO5_BX2           ECO5_BX2                4572
+eukrea_cpuimx28sd       MACH_EUKREA_CPUIMX28SD  EUKREA_CPUIMX28SD       4573
+domotab                 MACH_DOMOTAB            DOMOTAB                 4574
+pfla03                  MACH_PFLA03             PFLA03                  4575