diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 12:32:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 12:32:42 -0700 |
commit | f22c5579a7d600fa03f8c1d150cf78188f8709b6 (patch) | |
tree | 9865bd0b054c4407029bbb1d411b14091fc8d9bf /arch/riscv/kernel/setup.c | |
parent | Merge tag 'for-linus-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | riscv: Add SiFive drivers to rv32_defconfig (diff) | |
download | linux-f22c5579a7d600fa03f8c1d150cf78188f8709b6.tar.gz linux-f22c5579a7d600fa03f8c1d150cf78188f8709b6.tar.bz2 linux-f22c5579a7d600fa03f8c1d150cf78188f8709b6.zip |
Merge tag 'riscv-for-linus-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- The CLINT driver has been split in two: one to handle the M-mode
CLINT (memory mapped and used on NOMMU systems) and one to handle the
S-mode CLINT (via SBI).
- The addition of SiFive's drivers to rv32_defconfig
* tag 'riscv-for-linus-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: Add SiFive drivers to rv32_defconfig
dt-bindings: timer: Add CLINT bindings
RISC-V: Remove CLINT related code from timer and arch
clocksource/drivers: Add CLINT timer driver
RISC-V: Add mechanism to provide custom IPI operations
Diffstat (limited to 'arch/riscv/kernel/setup.c')
-rw-r--r-- | arch/riscv/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index f04373be54a6..2c6dd329312b 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -18,7 +18,6 @@ #include <linux/swiotlb.h> #include <linux/smp.h> -#include <asm/clint.h> #include <asm/cpu_ops.h> #include <asm/setup.h> #include <asm/sections.h> @@ -79,7 +78,6 @@ void __init setup_arch(char **cmdline_p) #else unflatten_device_tree(); #endif - clint_init_boot_cpu(); #ifdef CONFIG_SWIOTLB swiotlb_init(1); |