e9c1c83679
Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From d3115128bdafb62628ab41861a4f06f6d02ac320 Mon Sep 17 00:00:00 2001
|
|
From: Lech Perczak <lech.perczak@gmail.com>
|
|
Date: Mon, 10 Jan 2022 23:48:44 +0100
|
|
Subject: 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>
|
|
---
|
|
arch/mips/ath79/setup.c | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
--- 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)
|
|
@@ -233,7 +224,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;
|
|
}
|