Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd9abe1b authored by Colin Cross's avatar Colin Cross Committed by Kukjin Kim
Browse files

ARM: EXYNOS: fix CONFIG_DEBUG_LL



addruart cannot read from the physical address of the chipid
register, that will fail as soon as the mmu is turned on.
Fixing it to read from the physical or virtual address depending
on the mmu state also does not work, because there is a period
between head.S and exynos_map_io where the mmu is on, the uart
is mapped and used, but the chipid mapping is not yet present.

Fix addruart to use the ARM Main ID cp15 register to determine
if the core is Cortex A15 (EXYNOS5) or not (EXYNOS4).

Signed-off-by: default avatarColin Cross <ccross@android.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 8551f3ff
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@
	 */

	.macro addruart, rp, rv, tmp
		mov	\rp, #0x10000000
		ldr	\rp, [\rp, #0x0]
		and	\rp, \rp, #0xf00000
		teq	\rp, #0x500000		@@ EXYNOS5
		mrc	p15, 0, \tmp, c0, c0, 0
		and	\tmp, \tmp, #0xf0
		teq	\tmp, #0xf0		@@ A15
		ldreq	\rp, =EXYNOS5_PA_UART
		movne	\rp, #EXYNOS4_PA_UART	@@ EXYNOS4
		ldr	\rv, =S3C_VA_UART