aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/512x
diff options
context:
space:
mode:
authorGerhard Sittig <gsi@denx.de>2013-05-14 00:40:54 -0400
committerAnatolij Gustschin <agust@denx.de>2013-05-21 04:59:27 -0400
commita4f4124cf308275b4a2219d1e332dfc01d8bd6b7 (patch)
treee2b1c73455f66d84d6d86694a830c31976f96552 /arch/powerpc/platforms/512x
parent2abbbb63c90ab55ca3f054772c2e5ba7df810c48 (diff)
powerpc/mpc512x: initialize board restart earlier
move the MPC512x restart initialization from the shared init routine to the shared init_early routine recent problems in the proc(5) filesystem initialization led to the situation where the platform's restart routine was invoked yet the registers required for software reset were not yet available, which made the board hang instead of reboot Signed-off-by: Gerhard Sittig <gsi@denx.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc/platforms/512x')
-rw-r--r--arch/powerpc/platforms/512x/mpc512x_shared.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 09622d3323d7..a8b5110eb298 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -438,6 +438,7 @@ void __init mpc512x_psc_fifo_init(void)
438 438
439void __init mpc512x_init_early(void) 439void __init mpc512x_init_early(void)
440{ 440{
441 mpc512x_restart_init();
441 if (IS_ENABLED(CONFIG_FB_FSL_DIU)) 442 if (IS_ENABLED(CONFIG_FB_FSL_DIU))
442 mpc512x_init_diu(); 443 mpc512x_init_diu();
443} 444}
@@ -446,7 +447,6 @@ void __init mpc512x_init(void)
446{ 447{
447 mpc5121_clk_init(); 448 mpc5121_clk_init();
448 mpc512x_declare_of_platform_devices(); 449 mpc512x_declare_of_platform_devices();
449 mpc512x_restart_init();
450 mpc512x_psc_fifo_init(); 450 mpc512x_psc_fifo_init();
451} 451}
452 452