From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Mon, 7 Mar 2016 11:29:41 +0000 (+0900)
Subject: ARM: uniphier: allow debug_ll_init() to do nothing for unknown SoCs
X-Git-Tag: v2016.03~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d07648662edf2b994a6433465d472a9a3e89923;p=oweals%2Fu-boot.git

ARM: uniphier: allow debug_ll_init() to do nothing for unknown SoCs

This function should just return for unknown SoCs rather than writing
unexpected values to registers.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S b/arch/arm/mach-uniphier/arm32/debug_ll.S
index a70954cbee..8e4943cff9 100644
--- a/arch/arm/mach-uniphier/arm32/debug_ll.S
+++ b/arch/arm/mach-uniphier/arm32/debug_ll.S
@@ -175,6 +175,7 @@ proxstream2_end:
 	b		init_uart
 ph1_ld6b_end:
 #endif
+	mov		pc, lr
 
 init_uart:
 	addruart	r0, r1, r2