* [tip: timers/core] clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI
[not found] <20201028131230.72907-1-wangkefeng.wang@huawei.com>
@ 2020-12-03 23:47 ` tip-bot2 for Kefeng Wang
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Kefeng Wang @ 2020-12-03 23:47 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kefeng Wang, Palmer Dabbelt, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ab3105446f1ec4e98fadfc998ee24feec271c16c
Gitweb: https://git.kernel.org/tip/ab3105446f1ec4e98fadfc998ee24feec271c16c
Author: Kefeng Wang <wangkefeng.wang@huawei.com>
AuthorDate: Wed, 28 Oct 2020 21:12:30 +08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 03 Dec 2020 19:16:26 +01:00
clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI
The riscv timer is set via SBI timer call, let's make RISCV_TIMER
depends on RISCV_SBI, and it also fixes some build issue.
Fixes: d5be89a8d118 ("RISC-V: Resurrect the MMIO timer implementation for M-mode systems")
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201028131230.72907-1-wangkefeng.wang@huawei.com
---
drivers/clocksource/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 390c27c..9f00b83 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -644,7 +644,7 @@ config ATCPIT100_TIMER
config RISCV_TIMER
bool "Timer for the RISC-V platform" if COMPILE_TEST
- depends on GENERIC_SCHED_CLOCK && RISCV
+ depends on GENERIC_SCHED_CLOCK && RISCV && RISCV_SBI
select TIMER_PROBE
select TIMER_OF
help
^ permalink raw reply related [flat|nested] only message in thread