riscv: Move timers into drivers/timer
Subsystems (2)
v2 cover riscv: Move timers into drivers/timer
Now that mtime sources are regular timers, they can go in with the rest of the timer drivers. I have assigned maintenance of these drivers to Rick Chen, as they were previous under his purview.
Passing CI (for v1) located at [1].
[1] https://dev.azure.com/seanga2/9603e4b8-6f49-4106-b8fc-46e66a869d69/_build/results?buildId=45
Changes in v2:
- Rebase onto master
Sean Anderson (3):
riscv: Move Andes PLMT driver to drivers/timer
timer: Add _TIMER suffix to Andes PLMT Kconfig
riscv: Move timer portions of SiFive CLINT to drivers/timer
MAINTAINERS | 2 + arch/riscv/Kconfig | 7 --- arch/riscv/cpu/ax25/Kconfig | 2 +- arch/riscv/lib/Makefile | 1 - arch/riscv/lib/sifive_clint.c | 41 +--------------- drivers/timer/Kconfig | 7 +++ drivers/timer/Makefile | 2 + .../timer/andes_plmt_timer.c | 0 drivers/timer/sifive_clint_timer.c | 47 +++++++++++++++++++ 9 files changed, 61 insertions(+), 48 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%) create mode 100644 drivers/timer/sifive_clint_timer.c
Signature · 1 line
2.28.0
PATCH v2 1/3 riscv: Move Andes PLMT driver to drivers/timer
This is a regular timer driver, and should live with the other timer drivers.
---
(no changes since v1)
MAINTAINERS | 1 + arch/riscv/Kconfig | 7 ------- arch/riscv/lib/Makefile | 1 - drivers/timer/Kconfig | 7 +++++++ drivers/timer/Makefile | 1 + .../lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%)
MAINTAINERS +1 -0
@@ -938,6 +938,7 @@ S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ +F: drivers/timer/andes_plmt_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTE
arch/riscv/Kconfig +0 -7
@@ -170,13 +170,6 @@ config ANDES_PLIC The Andes PLIC block holds memory-mapped claim and pending registers associated with software interrupt. -config ANDES_PLMT - bool - depends on RISCV_MMODE || SPL_RISCV_MMODE - help - The Andes PLMT block holds memory-mapped mtime register - associated with timer tick. - config SYS_MALLOC_F_LEN default 0x1000
arch/riscv/lib/Makefile +0 -1
@@ -13,7 +13,6 @@ obj-y += cache.o ifeq ($(CONFIG_$(SPL_)RISCV_MMODE),y) obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint.o obj-$(CONFIG_ANDES_PLIC) += andes_plic.o -obj-$(CONFIG_ANDES_PLMT) += andes_plmt.o else obj-$(CONFIG_SBI) += sbi.o obj-$(CONFIG_SBI_IPI) += sbi_ipi.o
drivers/timer/Kconfig +7 -0
@@ -53,6 +53,13 @@ config ALTERA_TIMER Select this to enable a timer for Altera devices. Please find details on the "Embedded Peripherals IP User Guide" of Altera. +config ANDES_PLMT + bool + depends on RISCV_MMODE || SPL_RISCV_MMODE + help + The Andes PLMT block holds memory-mapped mtime register + associated with timer tick. + config ARC_TIMER bool "ARC timer support" depends on TIMER && ARC && CLK
drivers/timer/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-y += timer-uclass.o obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o +obj-$(CONFIG_ANDES_PLMT) += andes_plmt_timer.o obj-$(CONFIG_ARC_TIMER) += arc_timer.o obj-$(CONFIG_AST_TIMER) += ast_timer.o obj-$(CONFIG_ATCPIT100_TIMER) += atcpit100_timer.o
drivers/timer/andes_plmt_timer.c renamed from arch/riscv/lib/andes_plmt.c +0 -0
Signature · 1 line
2.28.0
PATCH v2 2/3 timer: Add _TIMER suffix to Andes PLMT Kconfig
In reply to Sean AndersonThis matches the naming scheme of other timer drivers.
---
(no changes since v1)
arch/riscv/cpu/ax25/Kconfig | 2 +- drivers/timer/Kconfig | 2 +- drivers/timer/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/riscv/cpu/ax25/Kconfig +1 -1
@@ -5,7 +5,7 @@ config RISCV_NDS imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply ANDES_PLIC if (RISCV_MMODE || SPL_RISCV_MMODE) - imply ANDES_PLMT if (RISCV_MMODE || SPL_RISCV_MMODE) + imply ANDES_PLMT_TIMER if (RISCV_MMODE || SPL_RISCV_MMODE) imply SPL_CPU_SUPPORT imply SPL_OPENSBI imply SPL_LOAD_FIT
drivers/timer/Kconfig +1 -1
@@ -53,7 +53,7 @@ config ALTERA_TIMER Select this to enable a timer for Altera devices. Please find details on the "Embedded Peripherals IP User Guide" of Altera. -config ANDES_PLMT +config ANDES_PLMT_TIMER bool depends on RISCV_MMODE || SPL_RISCV_MMODE help
drivers/timer/Makefile +1 -1
@@ -5,7 +5,7 @@ obj-y += timer-uclass.o obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o -obj-$(CONFIG_ANDES_PLMT) += andes_plmt_timer.o +obj-$(CONFIG_ANDES_PLMT_TIMER) += andes_plmt_timer.o obj-$(CONFIG_ARC_TIMER) += arc_timer.o obj-$(CONFIG_AST_TIMER) += ast_timer.o obj-$(CONFIG_ATCPIT100_TIMER) += atcpit100_timer.o
Signature · 1 line
2.28.0
PATCH v2 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
In reply to Sean AndersonHalf of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
---
Changes in v2:
- Rebase onto master
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 41 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 47 ++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 drivers/timer/sifive_clint_timer.c
MAINTAINERS +1 -0
@@ -939,6 +939,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ F: drivers/timer/andes_plmt_timer.c +F: drivers/timer/sifive_clint_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTE
arch/riscv/lib/sifive_clint.c +2 -39
61 lines not on this page · raw message
drivers/timer/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o +obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint_timer.o obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o
drivers/timer/sifive_clint_timer.c new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.28.0