colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: bcm283x: remove unused empty hw_watchdog_disable

Browse Source 
This empty stub was originally added as one branch of an #ifdef in
commit 45a6d231b2 (bcm2835_wdt: support for the BCM2835/2836
watchdog). That incarnation of the rpi watchdog driver was later
removed in c7adc0b5f9 (watchdog: bcm2835_wdt: Remove unused BCM283x
watchdog driver and its references), but this now unused stub was left
behind. The later (re-)added rpi watchdog driver does not define a
hw_watchdog_disable() function, as that is properly integrated in the
watchdog framework.

Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
Rasmus Villemoes
2024-07-12 11:07:24 +02:00
committed by Peter Robinson
parent c06687aa06
commit 6c399b31c6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-bcm283x/reset.c
View File

@@ -25,8 +25,6 @@
/* max ticks timeout */ /* max ticks timeout */
#define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff #define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff
void hw_watchdog_disable(void) {}
__efi_runtime_data struct bcm2835_wdog_regs *wdog_regs; __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs;
static void __efi_runtime static void __efi_runtime
@@ -34,10 +32,9 @@ __reset_cpu(struct bcm2835_wdog_regs *wdog_regs, ulong ticks)
{ {
uint32_t rstc, timeout; uint32_t rstc, timeout;
if (ticks == 0) { if (ticks == 0)
hw_watchdog_disable();
timeout = RESET_TIMEOUT; timeout = RESET_TIMEOUT;
} else else
timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT; timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT;
rstc = readl(&wdog_regs->rstc); rstc = readl(&wdog_regs->rstc);