From 4d632289299d302f6a899dfa1be752eb57a63538 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 18 Feb 2019 12:27:07 +0100 Subject: [PATCH] riscv: fix ARM_TIMER_SP804 (again) Bring back 6f9cf326c7c4eb48c9c8511ce7b0b22207337fc7 [..] Found unset config items, please set them to an appropriate value CONFIG_ARM_TIMER_SP804=n [..] Signed-off-by: David Abdurachmanov --- kernel.spec | 2 ++ riscv-arm-fix.patch | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 riscv-arm-fix.patch diff --git a/kernel.spec b/kernel.spec index 2c937c9ca..c8d8682df 100644 --- a/kernel.spec +++ b/kernel.spec @@ -626,6 +626,8 @@ Patch509: i915-enable-fastboot-on-skylake.patch # fastboot by default on VLV/CHV (BYT/CHT), queued in -next for merging into 5.1 Patch510: i915-enable-fastboot-on-vlv-chv.patch +Patch550: riscv-arm-fix.patch + # END OF PATCH DEFINITIONS %endif diff --git a/riscv-arm-fix.patch b/riscv-arm-fix.patch new file mode 100644 index 000000000..53832ee64 --- /dev/null +++ b/riscv-arm-fix.patch @@ -0,0 +1,25 @@ +From 7b8dfd22b3879a857d6bfb5ed2d4b232e8543b0a Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team +Date: Tue, 15 Jan 2019 02:19:44 +0000 +Subject: [PATCH] riscv arm fix + +--- + drivers/clocksource/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig +index 8dfd3bc..1605825 100644 +--- a/drivers/clocksource/Kconfig ++++ b/drivers/clocksource/Kconfig +@@ -379,7 +379,7 @@ config ARM_GLOBAL_TIMER + + config ARM_TIMER_SP804 + bool "Support for Dual Timer SP804 module" +- depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP ++ depends on (ARM || ARM64) && GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP + select CLKSRC_MMIO + select TIMER_OF if OF + +-- +2.17.1 +