From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Feb 2010 22:07:25 +0000 (+0000)
Subject: Merge branch 'tmpreg' into devel
X-Git-Tag: v2.6.34-rc1~241^2~3
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=186f93ea1f274f4cde4a356401c1786c818ff881

Merge branch 'tmpreg' into devel

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

186f93ea1f274f4cde4a356401c1786c818ff881
diff --cc arch/arm/Kconfig
index b0c3c0d,4c33ca8..7afc615
--- a/arch/arm/Kconfig
+++ b/arch/arm/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"
diff --cc arch/arm/Makefile
index 3eaef16,9e75825..52a820d
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -170,9 -171,7 +171,8 @@@ 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.
diff --cc arch/arm/mach-ux500/include/mach/debug-macro.S
index 8de225e,494408b..09cbfda
--- a/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.
   *
   */
 +#include <mach/hardware.h>
 +
- 	.macro	addruart,rx
+ 	.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>