Messages in this thread Patch in this message | | | From | Alban Bedel <> | Subject | [PATCH] MIPS: ath79: Use the reset controller to restart OF machines | Date | Tue, 26 Jan 2016 09:39:30 +0100 |
| |
Don't set _machine_restart() on OF machines as the reset driver now provides a system restart handler.
Signed-off-by: Alban Bedel <albeu@free.fr> --- arch/mips/ath79/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index be451ee4a..2fdba24 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -215,10 +215,11 @@ void __init plat_mem_setup(void) ath79_detect_sys_type(); ath79_ddr_ctrl_init(); - if (mips_machtype != ATH79_MACH_GENERIC_OF) + if (mips_machtype != ATH79_MACH_GENERIC_OF) { detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX); - - _machine_restart = ath79_restart; + /* OF machines should use the reset driver */ + _machine_restart = ath79_restart; + } _machine_halt = ath79_halt; pm_power_off = ath79_halt; } -- 2.0.0
| |