clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI

[ Upstream commit ab3105446f1ec4e98fadfc998ee24feec271c16c ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 68b087b..2be849b 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -654,7 +654,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