ARM: rockchip: rk3036: add initial support

[firefly-linux-kernel-4.4.55.git] / arch / arm / include / debug / rockchip.S

diff --git a/arch/arm/include/debug/rockchip.S b/arch/arm/include/debug/rockchip.S
index ebb6e2a8a31e69ce4e40c14b3259ab15af405848..39b907e25da2f3d5e25dd4a638fe594a528f7b67 100644 (file)
--- a/arch/arm/include/debug/rockchip.S
+++ b/arch/arm/include/debug/rockchip.S
@@ -20,8 +20,13 @@
                ldr     \rv, = 0x413fc090
                cmp     \tmp, \rv
                ldreq   \rp, = RK3188_UART2_PHYS
-               ldrne   \rp, = RK3288_UART_DBG_PHYS
-               ldr     \rv, = 0xfec00000
+               beq     10f
+               ldr     \rv, = 0x410fc075
+               cmp     \tmp, \rv
+               ldreq   \rp, = RK3036_UART2_PHYS
+               beq     10f
+               ldr     \rp, = RK3288_UART_DBG_PHYS
+10:            ldr     \rv, = 0xfec00000
                mov     \tmp, \rp
                bic     \tmp, \tmp, #0xff000000
                bic     \tmp, \tmp, #0x00f00000