diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-12 11:06:10 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-12 11:06:10 -0600 |
| commit | 1ca216522d41caa250c19dcb96d1f4c165556d90 (patch) | |
| tree | f89aac1714ac5fda53ded53e318c8ee720efed9e /arch/arm/mach-bcm283x | |
| parent | 780b99040bc1d5c3658532fd2f22d703a4acab04 (diff) | |
| parent | 7c503e14fbb8acdb5d85d47c1709ad31b7cf13b5 (diff) | |
Merge tag 'rpi-2024.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
Updates for RPi for 2024.10:
- board: rpi: remove leftover CONFIG_HW_WATCHDOG block
- arm: bcm283x: remove unused empty hw_watchdog_disable
- board: raspberrypi: Fix format specifier for printing rev_scheme
- Revert "arm: dts: bcm283x: Add minimal smbios information"
Diffstat (limited to 'arch/arm/mach-bcm283x')
| -rw-r--r-- | arch/arm/mach-bcm283x/reset.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index 9199234917f..1dc7ce50d1d 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -25,8 +25,6 @@ /* max ticks timeout */ #define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff -void hw_watchdog_disable(void) {} - __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs; static void __efi_runtime @@ -34,10 +32,9 @@ __reset_cpu(struct bcm2835_wdog_regs *wdog_regs, ulong ticks) { uint32_t rstc, timeout; - if (ticks == 0) { - hw_watchdog_disable(); + if (ticks == 0) timeout = RESET_TIMEOUT; - } else + else timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT; rstc = readl(&wdog_regs->rstc); |