summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLech Perczak <lech.perczak@gmail.com>2022-01-10 23:48:44 +0100
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2022-01-11 16:16:52 +0100
commitd3115128bdafb62628ab41861a4f06f6d02ac320 (patch)
treef33eee14427008782a010e480c1674715d5ea404
parentaa8589aac8e335e5e2e9a9de72a53913892e92f9 (diff)
downloadlinux-d3115128bdafb62628ab41861a4f06f6d02ac320.tar.gz
linux-d3115128bdafb62628ab41861a4f06f6d02ac320.tar.bz2
linux-d3115128bdafb62628ab41861a4f06f6d02ac320.zip
MIPS: ath79: drop _machine_restart again
Commit 81424d0ad0d4 ("MIPS: ath79: Use the reset controller to restart OF machines") removed setup of _machine_restart on OF machines to use reset handler in reset controller driver. While removing remnants of non-OF machines in commit 3a77e0d75eed ("MIPS: ath79: drop machfiles"), this was introduced again, making it impossible to use additional restart handlers registered through device tree. Drop setting _machine_restart altogether, and ath79_restart function, which is no longer used after this. Fixes: 3a77e0d75eed ("MIPS: ath79: drop machfiles") Cc: John Crispin <john@phrozen.org> Cc: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Lech Perczak <lech.perczak@gmail.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-rw-r--r--arch/mips/ath79/setup.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 891f495c4c3c..0ac435fe2dc9 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -34,15 +34,6 @@
static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
-static void ath79_restart(char *command)
-{
- local_irq_disable();
- ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
- for (;;)
- if (cpu_wait)
- cpu_wait();
-}
-
static void ath79_halt(void)
{
while (1)
@@ -234,7 +225,6 @@ void __init plat_mem_setup(void)
detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
- _machine_restart = ath79_restart;
_machine_halt = ath79_halt;
pm_power_off = ath79_halt;
}