diff options
| author | Tom Rini <[email protected]> | 2021-04-05 11:29:57 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-04-05 11:29:57 -0400 |
| commit | 90eba245a66aa20589404ba537215faf2012c1a3 (patch) | |
| tree | c581cd1f00dd162aeac4262bb4e74c2a9fea98c9 /drivers/timer | |
| parent | b46dd116ce03e235f2a7d4843c6278e1da44b5e1 (diff) | |
| parent | db8b46120aed6554d1ff405260ea6d2cc2439fcc (diff) | |
Merge branch 'next'
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/sandbox_timer.c | 3 | ||||
| -rw-r--r-- | drivers/timer/timer-uclass.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c index 2075cd4edda..c846bfb9f12 100644 --- a/drivers/timer/sandbox_timer.c +++ b/drivers/timer/sandbox_timer.c @@ -38,7 +38,8 @@ static int sandbox_timer_probe(struct udevice *dev) { struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); - if (dev_read_bool(dev, "sandbox,timebase-frequency-fallback")) + if (CONFIG_IS_ENABLED(CPU) && + dev_read_bool(dev, "sandbox,timebase-frequency-fallback")) return timer_timebase_fallback(dev); else if (!uc_priv->clock_rate) uc_priv->clock_rate = SANDBOX_TIMER_RATE; diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 6f00a5d0dba..73b4a5cd27f 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -83,11 +83,7 @@ static int timer_post_probe(struct udevice *dev) return 0; } -/* - * TODO: should be CONFIG_IS_ENABLED(CPU), but the SPL config has _SUPPORT on - * the end... - */ -#if defined(CONFIG_CPU) || defined(CONFIG_SPL_CPU_SUPPORT) +#if CONFIG_IS_ENABLED(CPU) int timer_timebase_fallback(struct udevice *dev) { struct udevice *cpu; |