diff options
| author | Tom Rini <[email protected]> | 2026-01-05 15:12:02 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-05 15:12:02 -0600 |
| commit | c344087025a4c296468a1d5aeb61078a58baa59e (patch) | |
| tree | f5a7ba04c352b3e3cb79065096ea43480f7bda2f /drivers/timer | |
| parent | 127a42c7257a6ffbbd1575ed1cbaa8f5408a44b3 (diff) | |
| parent | 6cdd7597a2fbfc1572c1b0af23d3daf1cefa2de7 (diff) | |
Merge branch 'next'
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/imx-gpt-timer.c | 2 | ||||
| -rw-r--r-- | drivers/timer/mpc83xx_timer.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/timer/imx-gpt-timer.c b/drivers/timer/imx-gpt-timer.c index 07b9fdb5e18..7708d1ba17f 100644 --- a/drivers/timer/imx-gpt-timer.c +++ b/drivers/timer/imx-gpt-timer.c @@ -127,7 +127,7 @@ static int imx_gpt_timer_probe(struct udevice *dev) /* Get timer clock rate */ clk_rate = clk_get_rate(&clk); - if (clk_rate <= 0) { + if (!clk_rate || IS_ERR_VALUE(clk_rate)) { dev_err(dev, "Could not get clock rate...\n"); return -EINVAL; } diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index f92009e4ccc..07fb66065b7 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -9,7 +9,6 @@ #include <dm.h> #include <irq_func.h> #include <log.h> -#include <status_led.h> #include <sysinfo.h> #include <time.h> #include <timer.h> @@ -178,10 +177,6 @@ void timer_interrupt(struct pt_regs *regs) if (CFG_SYS_WATCHDOG_FREQ && (priv->timestamp % (CFG_SYS_WATCHDOG_FREQ)) == 0) schedule(); #endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */ - -#ifdef CONFIG_LED_STATUS - status_led_tick(priv->timestamp); -#endif /* CONFIG_LED_STATUS */ } void wait_ticks(ulong ticks) |