35 files changed, 467 insertions, 279 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1ad6fb6c094d..df0c609272e5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -5,6 +5,7 @@ config ARM
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_HAVE_CUSTOM_GPIO_H
+        select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT if MMU
         select CLONE_BACKWARDS
@@ -1091,11 +1092,6 @@ config IWMMXT
           Enable support for iWMMXt context switching at run time if
           running on a CPU that supports it.
 
-config XSCALE_PMU
-        bool
-        depends on CPU_XSCALE
-        default y
-
 config MULTI_IRQ_HANDLER
         bool
         help
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9762c84b4198..a8f305b07f29 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -318,6 +318,7 @@ choice
         config DEBUG_MSM_UART1
                 bool "Kernel low-level debugging messages via MSM UART1"
                 depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                select DEBUG_MSM_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the first serial port on MSM devices.
@@ -325,6 +326,7 @@ choice
         config DEBUG_MSM_UART2
                 bool "Kernel low-level debugging messages via MSM UART2"
                 depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                select DEBUG_MSM_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the second serial port on MSM devices.
@@ -332,6 +334,7 @@ choice
         config DEBUG_MSM_UART3
                 bool "Kernel low-level debugging messages via MSM UART3"
                 depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                select DEBUG_MSM_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the third serial port on MSM devices.
@@ -340,6 +343,7 @@ choice
                 bool "Kernel low-level debugging messages via MSM 8660 UART"
                 depends on ARCH_MSM8X60
                 select MSM_HAS_DEBUG_UART_HS
+                select DEBUG_MSM_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the serial port on MSM 8660 devices.
@@ -348,10 +352,20 @@ choice
                 bool "Kernel low-level debugging messages via MSM 8960 UART"
                 depends on ARCH_MSM8960
                 select MSM_HAS_DEBUG_UART_HS
+                select DEBUG_MSM_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the serial port on MSM 8960 devices.
 
+        config DEBUG_MSM8974_UART
+                bool "Kernel low-level debugging messages via MSM 8974 UART"
+                depends on ARCH_MSM8974
+                select MSM_HAS_DEBUG_UART_HS
+                select DEBUG_MSM_UART
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port on MSM 8974 devices.
+
         config DEBUG_MVEBU_UART
                 bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
                 depends on ARCH_MVEBU
@@ -834,6 +848,20 @@ choice
                   options; the platform specific options are deprecated
                   and will be soon removed.
 
+        config DEBUG_LL_UART_EFM32
+                bool "Kernel low-level debugging via efm32 UART"
+                depends on ARCH_EFM32
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to an UART or USART port on efm32 based
+                  machines. Use the following addresses for DEBUG_UART_PHYS:
+
+                    0x4000c000 | USART0
+                    0x4000c400 | USART1
+                    0x4000c800 | USART2
+                    0x4000e000 | UART0
+                    0x4000e400 | UART1
+
         config DEBUG_LL_UART_PL01X
                 bool "Kernel low-level debugging via ARM Ltd PL01x Primecell UART"
                 help
@@ -880,11 +908,16 @@ config DEBUG_STI_UART
         bool
         depends on ARCH_STI
 
+config DEBUG_MSM_UART
+        bool
+        depends on ARCH_MSM
+
 config DEBUG_LL_INCLUDE
         string
         default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
         default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
         default "debug/exynos.S" if DEBUG_EXYNOS_UART
+        default "debug/efm32.S" if DEBUG_LL_UART_EFM32
         default "debug/icedcc.S" if DEBUG_ICEDCC
         default "debug/imx.S" if DEBUG_IMX1_UART || \
                                  DEBUG_IMX25_UART || \
@@ -895,11 +928,7 @@ config DEBUG_LL_INCLUDE