summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-11 22:18:22 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-12 00:31:01 +0900
commitb67932e3e72b6214cde75c7e2f796d0c70ff3ffb (patch)
treed557935114f8a599f344532d62761e25f9b3ac7a /arch/arm/cpu/armv7/uniphier/board_postclk_init.c
parent4f25481b839454f0f7b1818fdba07ded4a6b1fe1 (diff)
ARM: UniPhier: call pin_init() also in the normal boot
CONFIG_UNIPHIER_SERIAL has been moved to Kconfig and it is defined in ./.config but not in spl/.config, so pin_init() should be called from the normal image so that UART works correctly. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier/board_postclk_init.c')
-rw-r--r--arch/arm/cpu/armv7/uniphier/board_postclk_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/board_postclk_init.c b/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
index 3db336fc3e..89e44bb95b 100644
--- a/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
+++ b/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
@@ -20,6 +20,7 @@ void clkrst_init(void);
int board_postclk_init(void)
{
+#ifdef CONFIG_SOC_INIT
bcu_init();
sbc_init();
@@ -37,7 +38,7 @@ int board_postclk_init(void)
clkrst_init();
led_write(B, 2, , );
-
+#endif
pin_init();
led_write(B, 3, , );