Commit 81424d0a authored Jan 26, 2016 by Alban Bedel Committed by Ralf Baechle May 13, 2016

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>

parent b3f0a250

arch/mips/ath79/setup.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);

		/* OF machines should use the reset driver */
		_machine_restart = ath79_restart;
		}
		_machine_halt = ath79_halt;
		pm_power_off = ath79_halt;
		}