Skip to content

Commit d311512

Browse files
Leo-PLtsbogend
authored andcommitted
MIPS: ath79: drop _machine_restart again
Commit 81424d0 ("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 3a77e0d ("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: 3a77e0d ("MIPS: ath79: drop machfiles") Cc: John Crispin <[email protected]> Cc: Florian Fainelli <[email protected]> Signed-off-by: Lech Perczak <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent aa8589a commit d311512

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

arch/mips/ath79/setup.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@
3434

3535
static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
3636

37-
static void ath79_restart(char *command)
38-
{
39-
local_irq_disable();
40-
ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
41-
for (;;)
42-
if (cpu_wait)
43-
cpu_wait();
44-
}
45-
4637
static void ath79_halt(void)
4738
{
4839
while (1)
@@ -234,7 +225,6 @@ void __init plat_mem_setup(void)
234225

235226
detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
236227

237-
_machine_restart = ath79_restart;
238228
_machine_halt = ath79_halt;
239229
pm_power_off = ath79_halt;
240230
}

0 commit comments

Comments
 (0)