[PATCH] ARM: vexpress: ignore MIDR[0] for uart detection

[yrehan@gmail.com (Mian Yousaf Kaukab)]

Qemu vexpress-a9 target reports id of ARM Cortex-A9 core as r0p0
and uses legacy map. That is UART0 at address 0x10009000. Ignore
MIDR[0] during uart detection so that r0p0 as well as r0p1 use
legacy map.

Signed-off-by: Mian Yousaf Kaukab <yrehan@gmail.com>
---
 arch/arm/include/debug/vexpress.S | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
index 524acd5..932db8b 100644
--- a/arch/arm/include/debug/vexpress.S
+++ b/arch/arm/include/debug/vexpress.S
@@ -27,11 +27,16 @@
 
 		@ Make an educated guess regarding the memory map:
 		@ - the original A9 core tile (based on ARM Cortex-A9 r0p1)
-		@   should use UART at 0x10009000
+		@   should use UART at 0x10009000. Moreover, qemu vexpress-a9
+		@   target reports id of ARM Cortex-A9 core as r0p0 and uses
+		@   legacy map.
 		@ - all other (RS1 complaint) tiles use UART mapped
 		@   at 0x1c090000
 		mrc	p15, 0, \rp, c0, c0, 0
-		movw	\rv, #0xc091
+		mov	\rv, #1
+		@ Ignore MIDR[0] during comparison
+		bic	\rp, \rp, \rv
+		movw	\rv, #0xc090
 		movt	\rv, #0x410f
 		cmp	\rp, \rv
 
-- 
1.8.1.2