From: Alban Bedel <albeu@free.fr>
Date: Tue, 26 Jan 2016 08:39:30 +0000 (+0100)
Subject: MIPS: ath79: Use the reset controller to restart OF machines
X-Git-Tag: next-20160308~114^2~29
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c195af6029d6dec8ca302a0a3ea735bca75ebbe;p=karo-tx-linux.git

MIPS: ath79: Use the reset controller to restart OF machines

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>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12235/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 906ddace159a..01808e85e263 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -213,10 +213,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;
 }