Merge branch 'tmpreg' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/include/mach/debug-macro.S

diff --combined arch/arm/Kconfig
index b0c3c0d,4c33ca8..7afc615
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -550,15 -550,6 +550,15 @@@ config ARCH_W90X90
          <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
                ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
  
 +config ARCH_NUC93X
 +      bool "Nuvoton NUC93X CPU"
 +      select CPU_ARM926T
 +      select HAVE_CLK
 +      select COMMON_CLKDEV
 +      help
 +        Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
 +        low-power and high performance MPEG-4/JPEG multimedia controller chip.
 +
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        select CPU_ARM926T
@@@ -738,14 -729,26 +738,26 @@@ config ARCH_U850
  
  endchoice
  
+ source "arch/arm/mach-aaec2000/Kconfig"
+ 
+ source "arch/arm/mach-at91/Kconfig"
+ 
+ source "arch/arm/mach-bcmring/Kconfig"
+ 
  source "arch/arm/mach-clps711x/Kconfig"
  
+ source "arch/arm/mach-davinci/Kconfig"
+ 
+ source "arch/arm/mach-dove/Kconfig"
+ 
  source "arch/arm/mach-ep93xx/Kconfig"
  
  source "arch/arm/mach-footbridge/Kconfig"
  
  source "arch/arm/mach-gemini/Kconfig"
  
+ source "arch/arm/mach-h720x/Kconfig"
+ 
  source "arch/arm/mach-integrator/Kconfig"
  
  source "arch/arm/mach-iop32x/Kconfig"
@@@ -760,19 -763,27 +772,29 @@@ source "arch/arm/mach-ixp2000/Kconfig
  
  source "arch/arm/mach-ixp23xx/Kconfig"
  
+ source "arch/arm/mach-kirkwood/Kconfig"
+ 
+ source "arch/arm/mach-ks8695/Kconfig"
+ 
+ source "arch/arm/mach-lh7a40x/Kconfig"
+ 
  source "arch/arm/mach-loki/Kconfig"
  
+ source "arch/arm/mach-msm/Kconfig"
+ 
  source "arch/arm/mach-mv78xx0/Kconfig"
  
- source "arch/arm/mach-pxa/Kconfig"
- source "arch/arm/plat-pxa/Kconfig"
+ source "arch/arm/plat-mxc/Kconfig"
  
- source "arch/arm/mach-mmp/Kconfig"
+ source "arch/arm/mach-netx/Kconfig"
  
- source "arch/arm/mach-nuc93x/Kconfig"
+ source "arch/arm/mach-nomadik/Kconfig"
+ source "arch/arm/plat-nomadik/Kconfig"
  
- source "arch/arm/mach-sa1100/Kconfig"
+ source "arch/arm/mach-ns9xxx/Kconfig"
+ 
++source "arch/arm/mach-nuc93x/Kconfig"
 +
  source "arch/arm/plat-omap/Kconfig"
  
  source "arch/arm/mach-omap1/Kconfig"
@@@ -781,9 -792,14 +803,14 @@@ source "arch/arm/mach-omap2/Kconfig
  
  source "arch/arm/mach-orion5x/Kconfig"
  
- source "arch/arm/mach-kirkwood/Kconfig"
+ source "arch/arm/mach-pxa/Kconfig"
+ source "arch/arm/plat-pxa/Kconfig"
  
- source "arch/arm/mach-dove/Kconfig"
+ source "arch/arm/mach-mmp/Kconfig"
+ 
+ source "arch/arm/mach-realview/Kconfig"
+ 
+ source "arch/arm/mach-sa1100/Kconfig"
  
  source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
@@@ -811,41 -827,14 +838,14 @@@ if ARCH_S5PC1X
  source "arch/arm/mach-s5pc100/Kconfig"
  endif
  
- source "arch/arm/mach-lh7a40x/Kconfig"
+ source "arch/arm/mach-u300/Kconfig"
  
- source "arch/arm/mach-h720x/Kconfig"
+ source "arch/arm/mach-ux500/Kconfig"
  
  source "arch/arm/mach-versatile/Kconfig"
  
- source "arch/arm/mach-aaec2000/Kconfig"
- 
- source "arch/arm/mach-realview/Kconfig"
- 
- source "arch/arm/mach-at91/Kconfig"
- 
- source "arch/arm/plat-mxc/Kconfig"
- 
- source "arch/arm/mach-nomadik/Kconfig"
- source "arch/arm/plat-nomadik/Kconfig"
- 
- source "arch/arm/mach-netx/Kconfig"
- 
- source "arch/arm/mach-ns9xxx/Kconfig"
- 
- source "arch/arm/mach-davinci/Kconfig"
- 
- source "arch/arm/mach-ks8695/Kconfig"
- 
- source "arch/arm/mach-msm/Kconfig"
- 
- source "arch/arm/mach-u300/Kconfig"
- 
  source "arch/arm/mach-w90x900/Kconfig"
  
- source "arch/arm/mach-bcmring/Kconfig"
- 
- source "arch/arm/mach-ux500/Kconfig"
- 
  # Definitions to make life easier
  config ARCH_ACORN
        bool

diff --combined arch/arm/Makefile
index 3eaef16,9e75825..52a820d
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -146,6 -146,7 +146,7 @@@ machine-$(CONFIG_ARCH_MX1)         := mx
  machine-$(CONFIG_ARCH_MX2)            := mx2
  machine-$(CONFIG_ARCH_MX25)           := mx25
  machine-$(CONFIG_ARCH_MX3)            := mx3
+ machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  machine-$(CONFIG_ARCH_NETX)           := netx
  machine-$(CONFIG_ARCH_NOMADIK)                := nomadik
  machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx
@@@ -170,14 -171,13 +171,14 @@@ machine-$(CONFIG_ARCH_U300)             := u30
  machine-$(CONFIG_ARCH_U8500)          := ux500
  machine-$(CONFIG_ARCH_VERSATILE)      := versatile
  machine-$(CONFIG_ARCH_W90X900)                := w90x900
 +machine-$(CONFIG_ARCH_NUC93X)         := nuc93x
  machine-$(CONFIG_FOOTBRIDGE)          := footbridge
- machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  plat-$(CONFIG_ARCH_MXC)               := mxc
  plat-$(CONFIG_ARCH_OMAP)      := omap
+ plat-$(CONFIG_ARCH_STMP3XXX)  := stmp3xxx
  plat-$(CONFIG_PLAT_IOP)               := iop
  plat-$(CONFIG_PLAT_NOMADIK)   := nomadik
  plat-$(CONFIG_PLAT_ORION)     := orion
@@@ -185,7 -185,6 +186,6 @@@ plat-$(CONFIG_PLAT_PXA)            := px
  plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c samsung
  plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c samsung
  plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx s3c samsung
- plat-$(CONFIG_ARCH_STMP3XXX)  := stmp3xxx
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.

diff --combined arch/arm/mach-ux500/include/mach/debug-macro.S
index 8de225e,494408b..09cbfda
--- 1/arch/arm/mach-ux500/include/mach/debug-macro.S
--- 2/arch/arm/mach-ux500/include/mach/debug-macro.S
+++ b/arch/arm/mach-ux500/include/mach/debug-macro.S
@@@ -8,13 -8,12 +8,13 @@@
   * published by the Free Software Foundation.
   *
   */
-       .macro  addruart,rx
 +#include <mach/hardware.h>
 +
+       .macro  addruart, rx, tmp
        mrc     p15, 0, \rx, c1, c0
 -      tst     \rx, #1                 @MMU enabled?
 -      moveq   \rx, #0x80000000        @MMU off, Physical address
 -      movne   \rx, #0xF0000000        @MMU on, Virtual address
 -      orr     \rx, \rx, #0x7000
 +      tst     \rx, #1                                 @ MMU enabled?
 +      ldreq   \rx, =U8500_UART2_BASE                  @ no, physical address
 +      ldrne   \rx, =IO_ADDRESS(U8500_UART2_BASE)      @ yes, virtual address
        .endm
  
  #include <asm/hardware/debug-pl01x.S>