summaryrefslogtreecommitdiffstats
path: root/arch/mips/ath79
diff options
context:
space:
mode:
authorAlban Bedel <albeu@free.fr>2016-01-26 09:39:30 +0100
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 14:01:37 +0200
commit81424d0ad0d41f05049aac6d4959d17a5a3c69c8 (patch)
tree3a3143130f250f88f3731be32d7a88534a0565e7 /arch/mips/ath79
parentMIPS: ath79: Add zboot debug serial support (diff)
downloadlinux-81424d0ad0d41f05049aac6d4959d17a5a3c69c8.tar.xz
linux-81424d0ad0d41f05049aac6d4959d17a5a3c69c8.zip
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>
Diffstat (limited to 'arch/mips/ath79')
-rw-r--r--arch/mips/ath79/setup.c7
1 files changed, 4 insertions, 3 deletions
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;
}