ARM: UniPhier: reset on-board devices on start-up

If a support card is attached to the main board, the on-board
SMSC9118 LAN controller is available.  It must be kept in reset
state for a while on start-up.

When the board is kicked via a debbuger rather than pushing the
hardware reset button, on-board chips are not reset; in this case
the reset signals should be asserted by software.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c b/arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c
index 4302277dfc01f13db6fc879e895fc13f6f1e7103..5bb8179eb455524a2a81fd3cf057ddf3aaf51798 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c
+++ b/arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c
@@ -24,6 +24,8 @@ int board_postclk_init(void)
 
        sg_init();
 
+       uniphier_board_reset();
+
        pll_init();
 
        uniphier_board_init();

diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c b/arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c
index 7198829988bf8d14daad39a81c62512309b5c87f..9a537430e4a6e9d663bc30468711896e8a75bdbf 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c
+++ b/arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c
@@ -21,6 +21,8 @@ int board_postclk_init(void)
 
        sg_init();
 
+       uniphier_board_reset();
+
        pll_init();
 
        uniphier_board_init();

diff --git a/arch/arm/cpu/armv7/uniphier/reset.c b/arch/arm/cpu/armv7/uniphier/reset.c
index b0dc9673b470a731e54ddfea4cfeae1a81b4bf8d..50d1fed64798ff8bcb58cc50315de47962d29927 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/reset.c
+++ b/arch/arm/cpu/armv7/uniphier/reset.c
@@ -8,14 +8,11 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/sc-regs.h>
-#include <asm/arch/board.h>
 
 void reset_cpu(unsigned long ignored)
 {
        u32 tmp;
 
-       uniphier_board_reset();
-
        writel(5, SC_IRQTIMSET); /* default value */
 
        tmp  = readl(SC_SLFRSTSEL);