Merge branch 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux...

Merge branch 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux into next/fixes-non-critical

* 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux:
  ARM: vexpress: Make the debug UART detection more specific
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm/include/debug/vexpress.S

@@ -23,12 +23,14 @@
 		.macro	addruart,rp,rv,tmp
 
 		@ Make an educated guess regarding the memory map:
-		@ - the original A9 core tile, which has MPCore peripherals
-		@   located at 0x1e000000, should use UART at 0x10009000
+		@ - the original A9 core tile (based on ARM Cortex-A9 r0p1)
+		@   should use UART at 0x10009000
 		@ - all other (RS1 complaint) tiles use UART mapped
 		@   at 0x1c090000
-		mrc	p15, 4, \tmp, c15, c0, 0
-		cmp	\tmp, #0x1e000000
+		mrc	p15, 0, \rp, c0, c0, 0
+		movw	\rv, #0xc091
+		movt	\rv, #0x410f
+		cmp	\rp, \rv
 
 		@ Original memory map
 		moveq	\rp, #DEBUG_LL_UART_OFFSET