* [PATCH v4 0/3] Add timer driver for StarFive JH7110 RISC-V SoC
@ 2023-08-14 10:16 Xingyu Wu
2023-08-14 10:16 ` [PATCH v4 1/3] dt-bindings: timer: Add timer for StarFive JH7110 SoC Xingyu Wu
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Xingyu Wu @ 2023-08-14 10:16 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing
Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel,
Xingyu Wu, Samin Guo, linux-kernel, Conor Dooley
This patch serises are to add timer driver for the StarFive JH7110
RISC-V SoC. The first patch adds documentation to describe device
tree bindings. The subsequent patch adds timer driver and support
JH7110 SoC. The last patch adds device node about timer in JH7110
dts.
This timer has four free-running 32 bit counters and runs in 24MHz
clock on StarFive JH7110 SoC. And each channel(counter) triggers
an interrupt when timeout. They support one-shot mode and
continuous-run mode.
Changes since v3:
- Rebased on 6.5-rc6
- Dropped the useless enum names like 'JH7110_TIMER_CH_0'.
- Dropped the platform data about JH7110 and used the register offsets
directly.
- Drroped the useless functions of clk_disable_unprepare().
v3: https://lore.kernel.org/all/20230627055313.252519-1-xingyu.wu@starfivetech.com/
Changes since v2:
- Rebased on 6.4-rc7.
- Merged the header file into the c file.
- Renamed the functions from 'starfive_' to 'jh7110_'
- Used function 'clocksource_register_hz' instead of
'clocksource_mmio_init'.
v2: https://lore.kernel.org/all/20230320135433.144832-1-xingyu.wu@starfivetech.com/
Changes since v1:
- Added description about timer and modified properties' description
in dt-bindings.
- Dropped the 'interrupt-names' and 'clock-frequency' in dt-bindings.
- Renamed the functions and added 'starfive_'
- Modified that the driver probe by platform bus.
v1: https://lore.kernel.org/all/20221223094801.181315-1-xingyu.wu@starfivetech.com/
Xingyu Wu (3):
dt-bindings: timer: Add timer for StarFive JH7110 SoC
clocksource: Add JH7110 timer driver
riscv: dts: jh7110: starfive: Add timer node
.../bindings/timer/starfive,jh7110-timer.yaml | 96 ++++
MAINTAINERS | 7 +
arch/riscv/boot/dts/starfive/jh7110.dtsi | 20 +
drivers/clocksource/Kconfig | 11 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/timer-jh7110.c | 415 ++++++++++++++++++
6 files changed, 550 insertions(+)
create mode 100644 Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml
create mode 100644 drivers/clocksource/timer-jh7110.c
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v4 1/3] dt-bindings: timer: Add timer for StarFive JH7110 SoC 2023-08-14 10:16 [PATCH v4 0/3] Add timer driver for StarFive JH7110 RISC-V SoC Xingyu Wu @ 2023-08-14 10:16 ` Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 2/3] clocksource: Add JH7110 timer driver Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node Xingyu Wu 2 siblings, 0 replies; 7+ messages in thread From: Xingyu Wu @ 2023-08-14 10:16 UTC (permalink / raw) To: Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Xingyu Wu, Samin Guo, linux-kernel, Conor Dooley Add bindings for the timer on the JH7110 RISC-V SoC by StarFive Technology Ltd. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> --- .../bindings/timer/starfive,jh7110-timer.yaml | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml diff --git a/Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml b/Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml new file mode 100644 index 000000000000..9a2dac11eb06 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/starfive,jh7110-timer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive JH7110 Timer + +maintainers: + - Xingyu Wu <xingyu.wu@starfivetech.com> + - Samin Guo <samin.guo@starfivetech.com> + +description: + This timer has four free-running 32 bit counters in StarFive JH7110 SoC. + And each channel(counter) triggers an interrupt when timeout. They support + one-shot mode and continuous-run mode. + +properties: + compatible: + const: starfive,jh7110-timer + + reg: + maxItems: 1 + + interrupts: + items: + - description: channel 0 + - description: channel 1 + - description: channel 2 + - description: channel 3 + + clocks: + items: + - description: timer APB + - description: channel 0 + - description: channel 1 + - description: channel 2 + - description: channel 3 + + clock-names: + items: + - const: apb + - const: ch0 + - const: ch1 + - const: ch2 + - const: ch3 + + resets: + items: + - description: timer APB + - description: channel 0 + - description: channel 1 + - description: channel 2 + - description: channel 3 + + reset-names: + items: + - const: apb + - const: ch0 + - const: ch1 + - const: ch2 + - const: ch3 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + +additionalProperties: false + +examples: + - | + timer@13050000 { + compatible = "starfive,jh7110-timer"; + reg = <0x13050000 0x10000>; + interrupts = <69>, <70>, <71> ,<72>; + clocks = <&clk 124>, + <&clk 125>, + <&clk 126>, + <&clk 127>, + <&clk 128>; + clock-names = "apb", "ch0", "ch1", + "ch2", "ch3"; + resets = <&rst 117>, + <&rst 118>, + <&rst 119>, + <&rst 120>, + <&rst 121>; + reset-names = "apb", "ch0", "ch1", + "ch2", "ch3"; + }; + -- 2.25.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/3] clocksource: Add JH7110 timer driver 2023-08-14 10:16 [PATCH v4 0/3] Add timer driver for StarFive JH7110 RISC-V SoC Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 1/3] dt-bindings: timer: Add timer for StarFive JH7110 SoC Xingyu Wu @ 2023-08-14 10:16 ` Xingyu Wu 2023-08-17 8:20 ` Walker Chen 2023-08-14 10:16 ` [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node Xingyu Wu 2 siblings, 1 reply; 7+ messages in thread From: Xingyu Wu @ 2023-08-14 10:16 UTC (permalink / raw) To: Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Xingyu Wu, Samin Guo, linux-kernel, Conor Dooley Add timer driver for the StarFive JH7110 SoC. Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> --- MAINTAINERS | 7 + drivers/clocksource/Kconfig | 11 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-jh7110.c | 415 +++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+) create mode 100644 drivers/clocksource/timer-jh7110.c diff --git a/MAINTAINERS b/MAINTAINERS index 0903d87b17cb..00cf6a22e13c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20287,6 +20287,13 @@ S: Maintained F: Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml F: sound/soc/starfive/jh7110_tdm.c +STARFIVE JH7110 TIMER DRIVER +M: Samin Guo <samin.guo@starfivetech.com> +M: Xingyu Wu <xingyu.wu@starfivetech.com> +S: Supported +F: Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml +F: drivers/clocksource/timer-jh7110.c + STARFIVE JH71X0 CLOCK DRIVERS M: Emil Renner Berthing <kernel@esmil.dk> M: Hal Feng <hal.feng@starfivetech.com> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index c4d671a5a13d..171b9b54a499 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -648,6 +648,17 @@ config RISCV_TIMER is accessed via both the SBI and the rdcycle instruction. This is required for all RISC-V systems. +config STARFIVE_JH7110_TIMER + bool "Timer for the STARFIVE JH7110 SoC" + depends on ARCH_STARFIVE || COMPILE_TEST + select TIMER_OF + select CLKSRC_MMIO + default ARCH_STARFIVE + help + This enables the timer for StarFive JH7110 SoCs. On RISC-V platform, + the system has started RISCV_TIMER. But you can also use this timer + which can provides four channels to do a lot more on JH7110 SoC. + config CLINT_TIMER bool "CLINT Timer for the RISC-V platform" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK && RISCV diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 5d93c9e3fc55..56bd6d9ddd87 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_INGENIC_TIMER) += ingenic-timer.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o obj-$(CONFIG_RISCV_TIMER) += timer-riscv.o +obj-$(CONFIG_STARFIVE_JH7110_TIMER) += timer-jh7110.o obj-$(CONFIG_CLINT_TIMER) += timer-clint.o obj-$(CONFIG_CSKY_MP_TIMER) += timer-mp-csky.o obj-$(CONFIG_GX6605S_TIMER) += timer-gx6605s.o diff --git a/drivers/clocksource/timer-jh7110.c b/drivers/clocksource/timer-jh7110.c new file mode 100644 index 000000000000..fe3cfed55df7 --- /dev/null +++ b/drivers/clocksource/timer-jh7110.c @@ -0,0 +1,415 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Starfive JH7110 Timer driver + * + * Copyright (C) 2022-2023 StarFive Technology Co., Ltd. + * + * Author: + * Xingyu Wu <xingyu.wu@starfivetech.com> + * Samin Guo <samin.guo@starfivetech.com> + */ + +#include <linux/clk.h> +#include <linux/clockchips.h> +#include <linux/clocksource.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/iopoll.h> +#include <linux/irq.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/sched_clock.h> + +/* Bias: Ch0-0x0, Ch1-0x40, Ch2-0x80, and so on. */ +#define JH7110_TIMER_CH_LEN 0x40 +#define JH7110_TIMER_CH_BASE(x) ((x) * JH7110_TIMER_CH_LEN) +#define JH7110_TIMER_CH_MAX 4 + +#define JH7110_CLOCK_SOURCE_RATING 200 +#define JH7110_VALID_BITS 32 +#define JH7110_DELAY_US 0 +#define JH7110_TIMEOUT_US 10000 +#define JH7110_CLOCKEVENT_RATING 300 +#define JH7110_TIMER_MAX_TICKS 0xffffffff +#define JH7110_TIMER_MIN_TICKS 0xf +#define JH7110_TIMER_NAME_NUM 20 + +#define JH7110_TIMER_INT_STATUS 0x00 /* RO[0:4]: Interrupt Status for channel0~4 */ +#define JH7110_TIMER_CTL 0x04 /* RW[0]: 0-continuous run, 1-single run */ +#define JH7110_TIMER_LOAD 0x08 /* RW: load value to counter */ +#define JH7110_TIMER_ENABLE 0x10 /* RW[0]: timer enable register */ +#define JH7110_TIMER_RELOAD 0x14 /* RW: write 1 or 0 both reload counter */ +#define JH7110_TIMER_VALUE 0x18 /* RO: timer value register */ +#define JH7110_TIMER_INT_CLR 0x20 /* RW: timer interrupt clear register */ +#define JH7110_TIMER_INT_MASK 0x24 /* RW[0]: timer interrupt mask register */ +#define JH7110_TIMER_INT_CLR_AVA_MASK BIT(1) + +enum JH7110_TIMER_INTMASK { + JH7110_TIMER_INTMASK_DIS = 0, + JH7110_TIMER_INTMASK_ENA = 1 +}; + +enum JH7110_TIMER_MOD { + JH7110_TIMER_MOD_CONTIN = 0, + JH7110_TIMER_MOD_SINGLE = 1 +}; + +enum JH7110_TIMER_CTL_EN { + JH7110_TIMER_DIS = 0, + JH7110_TIMER_ENA = 1 +}; + +struct jh7110_clkevt { + struct clock_event_device evt; + struct clocksource cs; + struct clk *clk; + char name[JH7110_TIMER_NAME_NUM]; + int irq; + u32 periodic; + u32 rate; + u32 reload_val; + void __iomem *base; +}; + +struct jh7110_timer_priv { + struct device *dev; + void __iomem *base; + struct jh7110_clkevt clkevt[JH7110_TIMER_CH_MAX]; +}; + +static inline struct jh7110_clkevt *to_jh7110_clkevt(struct clock_event_device *evt) +{ + return container_of(evt, struct jh7110_clkevt, evt); +} + +/* 0:continuous-run mode, 1:single-run mode */ +static inline void jh7110_timer_set_continuous_mod(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_MOD_CONTIN, clkevt->base + JH7110_TIMER_CTL); +} + +static inline void jh7110_timer_set_single_mod(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_MOD_SINGLE, clkevt->base + JH7110_TIMER_CTL); +} + +/* Interrupt Mask Register, 0:Unmask, 1:Mask */ +static inline void jh7110_timer_int_enable(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_INTMASK_DIS, clkevt->base + JH7110_TIMER_INT_MASK); +} + +static inline void jh7110_timer_int_disable(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_INTMASK_ENA, clkevt->base + JH7110_TIMER_INT_MASK); +} + +/* + * BIT(0): Read value represent channel intr status. + * Write 1 to this bit to clear interrupt. Write 0 has no effects. + * BIT(1): "1" means that it is clearing interrupt. BIT(0) can not be written. + */ +static inline int jh7110_timer_int_clear(struct jh7110_clkevt *clkevt) +{ + u32 value; + int ret; + + /* waiting interrupt can be to clearing */ + ret = readl_poll_timeout_atomic(clkevt->base + JH7110_TIMER_INT_CLR, value, + !(value & JH7110_TIMER_INT_CLR_AVA_MASK), + JH7110_DELAY_US, JH7110_TIMEOUT_US); + if (!ret) + writel(0x1, clkevt->base + JH7110_TIMER_INT_CLR); + + return ret; +} + +/* + * The initial value to be loaded into the + * counter and is also used as the reload value. + * val = clock rate --> 1s + */ +static inline void jh7110_timer_set_load(struct jh7110_clkevt *clkevt, u32 val) +{ + writel(val, clkevt->base + JH7110_TIMER_LOAD); +} + +static inline u32 jh7110_timer_get_val(struct jh7110_clkevt *clkevt) +{ + return readl(clkevt->base + JH7110_TIMER_VALUE); +} + +/* + * Write RELOAD register to reload preset value to counter. + * Write 0 and write 1 are both ok. + */ +static inline void jh7110_timer_set_reload(struct jh7110_clkevt *clkevt) +{ + writel(0, clkevt->base + JH7110_TIMER_RELOAD); +} + +static inline void jh7110_timer_enable(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_ENA, clkevt->base + JH7110_TIMER_ENABLE); +} + +static inline void jh7110_timer_disable(struct jh7110_clkevt *clkevt) +{ + writel(JH7110_TIMER_DIS, clkevt->base + JH7110_TIMER_ENABLE); +} + +static int jh7110_timer_int_init_enable(struct jh7110_clkevt *clkevt) +{ + int ret; + + jh7110_timer_int_disable(clkevt); + ret = jh7110_timer_int_clear(clkevt); + if (ret) + return ret; + + jh7110_timer_int_enable(clkevt); + jh7110_timer_enable(clkevt); + + return 0; +} + +static int jh7110_timer_shutdown(struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + jh7110_timer_disable(clkevt); + return jh7110_timer_int_clear(clkevt); +} + +static void jh7110_timer_suspend(struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + clkevt->reload_val = jh7110_timer_get_val(clkevt); + jh7110_timer_shutdown(evt); +} + +static void jh7110_timer_resume(struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + jh7110_timer_set_load(clkevt, clkevt->reload_val); + jh7110_timer_set_reload(clkevt); + jh7110_timer_int_enable(clkevt); + jh7110_timer_enable(clkevt); +} + +static int jh7110_timer_tick_resume(struct clock_event_device *evt) +{ + jh7110_timer_resume(evt); + + return 0; +} + +/* IRQ handler for the timer */ +static irqreturn_t jh7110_timer_interrupt(int irq, void *priv) +{ + struct clock_event_device *evt = (struct clock_event_device *)priv; + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + if (jh7110_timer_int_clear(clkevt)) + return IRQ_NONE; + + if (evt->event_handler) + evt->event_handler(evt); + + return IRQ_HANDLED; +} + +static int jh7110_timer_set_periodic(struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + clkevt->periodic = DIV_ROUND_CLOSEST(clkevt->rate, HZ); + jh7110_timer_disable(clkevt); + jh7110_timer_set_continuous_mod(clkevt); + jh7110_timer_set_load(clkevt, clkevt->periodic); + + return jh7110_timer_int_init_enable(clkevt); +} + +static int jh7110_timer_set_oneshot(struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + jh7110_timer_disable(clkevt); + jh7110_timer_set_single_mod(clkevt); + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); + + return jh7110_timer_int_init_enable(clkevt); +} + +static int jh7110_timer_set_next_event(unsigned long next, + struct clock_event_device *evt) +{ + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); + + jh7110_timer_disable(clkevt); + jh7110_timer_set_single_mod(clkevt); + jh7110_timer_set_load(clkevt, next); + jh7110_timer_enable(clkevt); + + return 0; +} + +static void jh7110_set_clockevent(struct clock_event_device *evt) +{ + evt->features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT | + CLOCK_EVT_FEAT_DYNIRQ; + evt->set_state_shutdown = jh7110_timer_shutdown; + evt->set_state_periodic = jh7110_timer_set_periodic; + evt->set_state_oneshot = jh7110_timer_set_oneshot; + evt->set_state_oneshot_stopped = jh7110_timer_shutdown; + evt->tick_resume = jh7110_timer_tick_resume; + evt->set_next_event = jh7110_timer_set_next_event; + evt->suspend = jh7110_timer_suspend; + evt->resume = jh7110_timer_resume; + evt->rating = JH7110_CLOCKEVENT_RATING; +} + +static u64 jh7110_timer_clocksource_read(struct clocksource *cs) +{ + struct jh7110_clkevt *clkevt = container_of(cs, struct jh7110_clkevt, cs); + + return (u64)jh7110_timer_get_val(clkevt); +} + +static int jh7110_clocksource_init(struct jh7110_clkevt *clkevt) +{ + int ret; + + jh7110_timer_set_continuous_mod(clkevt); + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); + + ret = jh7110_timer_int_init_enable(clkevt); + if (ret) + return ret; + + clkevt->cs.name = clkevt->name; + clkevt->cs.rating = JH7110_CLOCK_SOURCE_RATING; + clkevt->cs.read = jh7110_timer_clocksource_read; + clkevt->cs.mask = CLOCKSOURCE_MASK(JH7110_VALID_BITS); + clkevt->cs.flags = CLOCK_SOURCE_IS_CONTINUOUS; + + return clocksource_register_hz(&clkevt->cs, clkevt->rate); +} + +static void jh7110_clockevents_register(struct jh7110_clkevt *clkevt) +{ + clkevt->rate = clk_get_rate(clkevt->clk); + + jh7110_set_clockevent(&clkevt->evt); + clkevt->evt.name = clkevt->name; + clkevt->evt.irq = clkevt->irq; + clkevt->evt.cpumask = cpu_possible_mask; + + clockevents_config_and_register(&clkevt->evt, clkevt->rate, + JH7110_TIMER_MIN_TICKS, JH7110_TIMER_MAX_TICKS); +} + +static int jh7110_timer_probe(struct platform_device *pdev) +{ + char name[JH7110_TIMER_NAME_NUM]; + struct jh7110_timer_priv *priv; + struct jh7110_clkevt *clkevt; + struct clk *pclk; + struct reset_control *rst; + int ch; + int ret; + + priv = devm_kzalloc(&pdev->dev, struct_size(priv, clkevt, JH7110_TIMER_CH_MAX), + GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->base)) + return dev_err_probe(&pdev->dev, PTR_ERR(priv->base), + "failed to map registers\n"); + + rst = devm_reset_control_get_exclusive(&pdev->dev, "apb"); + if (IS_ERR(rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rst), "failed to get apb reset\n"); + + pclk = devm_clk_get_enabled(&pdev->dev, "apb"); + if (IS_ERR(pclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(pclk), + "failed to get & enable apb clock\n"); + + ret = reset_control_deassert(rst); + if (ret) + return dev_err_probe(&pdev->dev, ret, "failed to deassert apb reset\n"); + + priv->dev = &pdev->dev; + platform_set_drvdata(pdev, priv); + + for (ch = 0; ch < JH7110_TIMER_CH_MAX; ch++) { + clkevt = &priv->clkevt[ch]; + snprintf(name, sizeof(name), "ch%d", ch); + + clkevt->base = priv->base + JH7110_TIMER_CH_BASE(ch); + /* Ensure timers are disabled */ + jh7110_timer_disable(clkevt); + + rst = devm_reset_control_get_exclusive(&pdev->dev, name); + if (IS_ERR(rst)) + return PTR_ERR(rst); + + clkevt->clk = devm_clk_get_enabled(&pdev->dev, name); + if (IS_ERR(clkevt->clk)) + return PTR_ERR(clkevt->clk); + + ret = reset_control_deassert(rst); + if (ret) + return ret; + + clkevt->irq = platform_get_irq(pdev, ch); + if (clkevt->irq < 0) + return clkevt->irq; + + snprintf(clkevt->name, sizeof(clkevt->name), "%s.ch%d", pdev->name, ch); + jh7110_clockevents_register(clkevt); + + ret = devm_request_irq(&pdev->dev, clkevt->irq, jh7110_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, + clkevt->name, &clkevt->evt); + if (ret) + return ret; + + ret = jh7110_clocksource_init(clkevt); + if (ret) + return ret; + } + + return 0; +} + +static const struct of_device_id jh7110_timer_match[] = { + { .compatible = "starfive,jh7110-timer", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, jh7110_timer_match); + +static struct platform_driver jh7110_timer_driver = { + .probe = jh7110_timer_probe, + .driver = { + .name = "jh7110-timer", + .of_match_table = jh7110_timer_match, + }, +}; +module_platform_driver(jh7110_timer_driver); + +MODULE_AUTHOR("Xingyu Wu <xingyu.wu@starfivetech.com>"); +MODULE_DESCRIPTION("StarFive JH7110 timer driver"); +MODULE_LICENSE("GPL"); -- 2.25.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 2/3] clocksource: Add JH7110 timer driver 2023-08-14 10:16 ` [PATCH v4 2/3] clocksource: Add JH7110 timer driver Xingyu Wu @ 2023-08-17 8:20 ` Walker Chen 2023-09-01 3:07 ` Xingyu Wu 0 siblings, 1 reply; 7+ messages in thread From: Walker Chen @ 2023-08-17 8:20 UTC (permalink / raw) To: Xingyu Wu, Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Samin Guo, linux-kernel, Conor Dooley On 2023/8/14 18:16, Xingyu Wu wrote: > Add timer driver for the StarFive JH7110 SoC. > > Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> > --- > MAINTAINERS | 7 + > drivers/clocksource/Kconfig | 11 + > drivers/clocksource/Makefile | 1 + > drivers/clocksource/timer-jh7110.c | 415 +++++++++++++++++++++++++++++ > 4 files changed, 434 insertions(+) > create mode 100644 drivers/clocksource/timer-jh7110.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0903d87b17cb..00cf6a22e13c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -20287,6 +20287,13 @@ S: Maintained > F: Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml > F: sound/soc/starfive/jh7110_tdm.c > > +STARFIVE JH7110 TIMER DRIVER > +M: Samin Guo <samin.guo@starfivetech.com> > +M: Xingyu Wu <xingyu.wu@starfivetech.com> > +S: Supported > +F: Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml > +F: drivers/clocksource/timer-jh7110.c > + > STARFIVE JH71X0 CLOCK DRIVERS > M: Emil Renner Berthing <kernel@esmil.dk> > M: Hal Feng <hal.feng@starfivetech.com> > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index c4d671a5a13d..171b9b54a499 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -648,6 +648,17 @@ config RISCV_TIMER > is accessed via both the SBI and the rdcycle instruction. This is > required for all RISC-V systems. > > +config STARFIVE_JH7110_TIMER > + bool "Timer for the STARFIVE JH7110 SoC" > + depends on ARCH_STARFIVE || COMPILE_TEST > + select TIMER_OF > + select CLKSRC_MMIO > + default ARCH_STARFIVE > + help > + This enables the timer for StarFive JH7110 SoCs. On RISC-V platform, > + the system has started RISCV_TIMER. But you can also use this timer > + which can provides four channels to do a lot more on JH7110 SoC. Correct some grammar errors as follows: This enables the timer for StarFive JH7110 SoC. On RISC-V platform, the system has started RISCV_TIMER, but you can also use this timer which can provide four channels to do a lot more things on JH7110 SoC. > + > config CLINT_TIMER > bool "CLINT Timer for the RISC-V platform" if COMPILE_TEST > depends on GENERIC_SCHED_CLOCK && RISCV > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > index 5d93c9e3fc55..56bd6d9ddd87 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -81,6 +81,7 @@ obj-$(CONFIG_INGENIC_TIMER) += ingenic-timer.o > obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o > obj-$(CONFIG_X86_NUMACHIP) += numachip.o > obj-$(CONFIG_RISCV_TIMER) += timer-riscv.o > +obj-$(CONFIG_STARFIVE_JH7110_TIMER) += timer-jh7110.o > obj-$(CONFIG_CLINT_TIMER) += timer-clint.o > obj-$(CONFIG_CSKY_MP_TIMER) += timer-mp-csky.o > obj-$(CONFIG_GX6605S_TIMER) += timer-gx6605s.o > diff --git a/drivers/clocksource/timer-jh7110.c b/drivers/clocksource/timer-jh7110.c > new file mode 100644 > index 000000000000..fe3cfed55df7 > --- /dev/null > +++ b/drivers/clocksource/timer-jh7110.c > @@ -0,0 +1,415 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Starfive JH7110 Timer driver > + * > + * Copyright (C) 2022-2023 StarFive Technology Co., Ltd. > + * > + * Author: > + * Xingyu Wu <xingyu.wu@starfivetech.com> > + * Samin Guo <samin.guo@starfivetech.com> > + */ > + > +#include <linux/clk.h> > +#include <linux/clockchips.h> > +#include <linux/clocksource.h> > +#include <linux/err.h> > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/iopoll.h> > +#include <linux/irq.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > +#include <linux/reset.h> > +#include <linux/sched_clock.h> > + > +/* Bias: Ch0-0x0, Ch1-0x40, Ch2-0x80, and so on. */ > +#define JH7110_TIMER_CH_LEN 0x40 > +#define JH7110_TIMER_CH_BASE(x) ((x) * JH7110_TIMER_CH_LEN) > +#define JH7110_TIMER_CH_MAX 4 > + > +#define JH7110_CLOCK_SOURCE_RATING 200 > +#define JH7110_VALID_BITS 32 > +#define JH7110_DELAY_US 0 > +#define JH7110_TIMEOUT_US 10000 > +#define JH7110_CLOCKEVENT_RATING 300 > +#define JH7110_TIMER_MAX_TICKS 0xffffffff > +#define JH7110_TIMER_MIN_TICKS 0xf > +#define JH7110_TIMER_NAME_NUM 20 > + > +#define JH7110_TIMER_INT_STATUS 0x00 /* RO[0:4]: Interrupt Status for channel0~4 */ > +#define JH7110_TIMER_CTL 0x04 /* RW[0]: 0-continuous run, 1-single run */ > +#define JH7110_TIMER_LOAD 0x08 /* RW: load value to counter */ > +#define JH7110_TIMER_ENABLE 0x10 /* RW[0]: timer enable register */ > +#define JH7110_TIMER_RELOAD 0x14 /* RW: write 1 or 0 both reload counter */ > +#define JH7110_TIMER_VALUE 0x18 /* RO: timer value register */ > +#define JH7110_TIMER_INT_CLR 0x20 /* RW: timer interrupt clear register */ > +#define JH7110_TIMER_INT_MASK 0x24 /* RW[0]: timer interrupt mask register */ > +#define JH7110_TIMER_INT_CLR_AVA_MASK BIT(1) > + > +enum JH7110_TIMER_INTMASK { > + JH7110_TIMER_INTMASK_DIS = 0, > + JH7110_TIMER_INTMASK_ENA = 1 > +}; > + > +enum JH7110_TIMER_MOD { > + JH7110_TIMER_MOD_CONTIN = 0, > + JH7110_TIMER_MOD_SINGLE = 1 > +}; > + > +enum JH7110_TIMER_CTL_EN { > + JH7110_TIMER_DIS = 0, > + JH7110_TIMER_ENA = 1 > +}; > + > +struct jh7110_clkevt { > + struct clock_event_device evt; > + struct clocksource cs; > + struct clk *clk; > + char name[JH7110_TIMER_NAME_NUM]; > + int irq; > + u32 periodic; > + u32 rate; > + u32 reload_val; > + void __iomem *base; > +}; > + > +struct jh7110_timer_priv { > + struct device *dev; > + void __iomem *base; > + struct jh7110_clkevt clkevt[JH7110_TIMER_CH_MAX]; > +}; > + > +static inline struct jh7110_clkevt *to_jh7110_clkevt(struct clock_event_device *evt) > +{ > + return container_of(evt, struct jh7110_clkevt, evt); > +} > + > +/* 0:continuous-run mode, 1:single-run mode */ > +static inline void jh7110_timer_set_continuous_mod(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_MOD_CONTIN, clkevt->base + JH7110_TIMER_CTL); Why not write 0 directly? Seems that the macro JH7110_TIMER_MOD_CONTIN is redundant, because the function name 'jh7110_timer_set_continuous_mod' already expresses its purpose. > +} > + > +static inline void jh7110_timer_set_single_mod(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_MOD_SINGLE, clkevt->base + JH7110_TIMER_CTL); Same as above. > +} > + > +/* Interrupt Mask Register, 0:Unmask, 1:Mask */ > +static inline void jh7110_timer_int_enable(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_INTMASK_DIS, clkevt->base + JH7110_TIMER_INT_MASK); Same, the enum variable 'JH7110_TIMER_INTMASK_DIS' is redundant, should be replaced with specific integer value and drop the definition of enum JH7110_TIMER_INTMASK. > +} > + > +static inline void jh7110_timer_int_disable(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_INTMASK_ENA, clkevt->base + JH7110_TIMER_INT_MASK); Same. > +} > + > +/* > + * BIT(0): Read value represent channel intr status. > + * Write 1 to this bit to clear interrupt. Write 0 has no effects. > + * BIT(1): "1" means that it is clearing interrupt. BIT(0) can not be written. > + */ > +static inline int jh7110_timer_int_clear(struct jh7110_clkevt *clkevt) > +{ > + u32 value; > + int ret; > + > + /* waiting interrupt can be to clearing */ > + ret = readl_poll_timeout_atomic(clkevt->base + JH7110_TIMER_INT_CLR, value, > + !(value & JH7110_TIMER_INT_CLR_AVA_MASK), > + JH7110_DELAY_US, JH7110_TIMEOUT_US); > + if (!ret) > + writel(0x1, clkevt->base + JH7110_TIMER_INT_CLR); > + > + return ret; > +} > + > +/* > + * The initial value to be loaded into the > + * counter and is also used as the reload value. > + * val = clock rate --> 1s > + */ > +static inline void jh7110_timer_set_load(struct jh7110_clkevt *clkevt, u32 val) > +{ > + writel(val, clkevt->base + JH7110_TIMER_LOAD); > +} > + > +static inline u32 jh7110_timer_get_val(struct jh7110_clkevt *clkevt) > +{ > + return readl(clkevt->base + JH7110_TIMER_VALUE); > +} > + > +/* > + * Write RELOAD register to reload preset value to counter. > + * Write 0 and write 1 are both ok. > + */ > +static inline void jh7110_timer_set_reload(struct jh7110_clkevt *clkevt) > +{ > + writel(0, clkevt->base + JH7110_TIMER_RELOAD); > +} > + > +static inline void jh7110_timer_enable(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_ENA, clkevt->base + JH7110_TIMER_ENABLE); should be replaced with specific integer value and drop the definition of enum JH7110_TIMER_CTL_EN. > +} > + > +static inline void jh7110_timer_disable(struct jh7110_clkevt *clkevt) > +{ > + writel(JH7110_TIMER_DIS, clkevt->base + JH7110_TIMER_ENABLE); Same as above. > +} > + > +static int jh7110_timer_int_init_enable(struct jh7110_clkevt *clkevt) > +{ > + int ret; > + > + jh7110_timer_int_disable(clkevt); > + ret = jh7110_timer_int_clear(clkevt); > + if (ret) > + return ret; > + > + jh7110_timer_int_enable(clkevt); > + jh7110_timer_enable(clkevt); > + > + return 0; > +} > + > +static int jh7110_timer_shutdown(struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + jh7110_timer_disable(clkevt); > + return jh7110_timer_int_clear(clkevt); > +} > + > +static void jh7110_timer_suspend(struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + clkevt->reload_val = jh7110_timer_get_val(clkevt); > + jh7110_timer_shutdown(evt); > +} > + > +static void jh7110_timer_resume(struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + jh7110_timer_set_load(clkevt, clkevt->reload_val); > + jh7110_timer_set_reload(clkevt); > + jh7110_timer_int_enable(clkevt); > + jh7110_timer_enable(clkevt); > +} > + > +static int jh7110_timer_tick_resume(struct clock_event_device *evt) > +{ > + jh7110_timer_resume(evt); > + > + return 0; > +} > + > +/* IRQ handler for the timer */ > +static irqreturn_t jh7110_timer_interrupt(int irq, void *priv) > +{ > + struct clock_event_device *evt = (struct clock_event_device *)priv; > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + if (jh7110_timer_int_clear(clkevt)) > + return IRQ_NONE; > + > + if (evt->event_handler) > + evt->event_handler(evt); > + > + return IRQ_HANDLED; > +} > + > +static int jh7110_timer_set_periodic(struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + clkevt->periodic = DIV_ROUND_CLOSEST(clkevt->rate, HZ); > + jh7110_timer_disable(clkevt); > + jh7110_timer_set_continuous_mod(clkevt); > + jh7110_timer_set_load(clkevt, clkevt->periodic); > + > + return jh7110_timer_int_init_enable(clkevt); > +} > + > +static int jh7110_timer_set_oneshot(struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + jh7110_timer_disable(clkevt); > + jh7110_timer_set_single_mod(clkevt); > + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); > + > + return jh7110_timer_int_init_enable(clkevt); > +} > + > +static int jh7110_timer_set_next_event(unsigned long next, > + struct clock_event_device *evt) > +{ > + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); > + > + jh7110_timer_disable(clkevt); > + jh7110_timer_set_single_mod(clkevt); > + jh7110_timer_set_load(clkevt, next); > + jh7110_timer_enable(clkevt); > + > + return 0; > +} > + > +static void jh7110_set_clockevent(struct clock_event_device *evt) > +{ > + evt->features = CLOCK_EVT_FEAT_PERIODIC | > + CLOCK_EVT_FEAT_ONESHOT | > + CLOCK_EVT_FEAT_DYNIRQ; > + evt->set_state_shutdown = jh7110_timer_shutdown; > + evt->set_state_periodic = jh7110_timer_set_periodic; > + evt->set_state_oneshot = jh7110_timer_set_oneshot; > + evt->set_state_oneshot_stopped = jh7110_timer_shutdown; > + evt->tick_resume = jh7110_timer_tick_resume; > + evt->set_next_event = jh7110_timer_set_next_event; > + evt->suspend = jh7110_timer_suspend; > + evt->resume = jh7110_timer_resume; > + evt->rating = JH7110_CLOCKEVENT_RATING; > +} > + > +static u64 jh7110_timer_clocksource_read(struct clocksource *cs) > +{ > + struct jh7110_clkevt *clkevt = container_of(cs, struct jh7110_clkevt, cs); > + > + return (u64)jh7110_timer_get_val(clkevt); > +} > + > +static int jh7110_clocksource_init(struct jh7110_clkevt *clkevt) > +{ > + int ret; > + > + jh7110_timer_set_continuous_mod(clkevt); > + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); > + > + ret = jh7110_timer_int_init_enable(clkevt); > + if (ret) > + return ret; > + > + clkevt->cs.name = clkevt->name; > + clkevt->cs.rating = JH7110_CLOCK_SOURCE_RATING; > + clkevt->cs.read = jh7110_timer_clocksource_read; > + clkevt->cs.mask = CLOCKSOURCE_MASK(JH7110_VALID_BITS); > + clkevt->cs.flags = CLOCK_SOURCE_IS_CONTINUOUS; > + > + return clocksource_register_hz(&clkevt->cs, clkevt->rate); > +} > + > +static void jh7110_clockevents_register(struct jh7110_clkevt *clkevt) > +{ > + clkevt->rate = clk_get_rate(clkevt->clk); > + > + jh7110_set_clockevent(&clkevt->evt); > + clkevt->evt.name = clkevt->name; > + clkevt->evt.irq = clkevt->irq; > + clkevt->evt.cpumask = cpu_possible_mask; > + > + clockevents_config_and_register(&clkevt->evt, clkevt->rate, > + JH7110_TIMER_MIN_TICKS, JH7110_TIMER_MAX_TICKS); > +} > + > +static int jh7110_timer_probe(struct platform_device *pdev) > +{ > + char name[JH7110_TIMER_NAME_NUM]; > + struct jh7110_timer_priv *priv; > + struct jh7110_clkevt *clkevt; > + struct clk *pclk; > + struct reset_control *rst; > + int ch; > + int ret; > + > + priv = devm_kzalloc(&pdev->dev, struct_size(priv, clkevt, JH7110_TIMER_CH_MAX), > + GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(priv->base)) > + return dev_err_probe(&pdev->dev, PTR_ERR(priv->base), > + "failed to map registers\n"); > + > + rst = devm_reset_control_get_exclusive(&pdev->dev, "apb"); > + if (IS_ERR(rst)) > + return dev_err_probe(&pdev->dev, PTR_ERR(rst), "failed to get apb reset\n"); > + > + pclk = devm_clk_get_enabled(&pdev->dev, "apb"); > + if (IS_ERR(pclk)) > + return dev_err_probe(&pdev->dev, PTR_ERR(pclk), > + "failed to get & enable apb clock\n"); > + > + ret = reset_control_deassert(rst); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "failed to deassert apb reset\n"); > + > + priv->dev = &pdev->dev; > + platform_set_drvdata(pdev, priv); > + > + for (ch = 0; ch < JH7110_TIMER_CH_MAX; ch++) { > + clkevt = &priv->clkevt[ch]; > + snprintf(name, sizeof(name), "ch%d", ch); > + > + clkevt->base = priv->base + JH7110_TIMER_CH_BASE(ch); > + /* Ensure timers are disabled */ > + jh7110_timer_disable(clkevt); > + > + rst = devm_reset_control_get_exclusive(&pdev->dev, name); > + if (IS_ERR(rst)) > + return PTR_ERR(rst); > + > + clkevt->clk = devm_clk_get_enabled(&pdev->dev, name); > + if (IS_ERR(clkevt->clk)) > + return PTR_ERR(clkevt->clk); > + > + ret = reset_control_deassert(rst); > + if (ret) > + return ret; > + > + clkevt->irq = platform_get_irq(pdev, ch); > + if (clkevt->irq < 0) > + return clkevt->irq; > + > + snprintf(clkevt->name, sizeof(clkevt->name), "%s.ch%d", pdev->name, ch); > + jh7110_clockevents_register(clkevt); > + > + ret = devm_request_irq(&pdev->dev, clkevt->irq, jh7110_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, > + clkevt->name, &clkevt->evt); > + if (ret) > + return ret; > + > + ret = jh7110_clocksource_init(clkevt); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > +static const struct of_device_id jh7110_timer_match[] = { > + { .compatible = "starfive,jh7110-timer", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, jh7110_timer_match); > + > +static struct platform_driver jh7110_timer_driver = { > + .probe = jh7110_timer_probe, > + .driver = { > + .name = "jh7110-timer", > + .of_match_table = jh7110_timer_match, > + }, > +}; > +module_platform_driver(jh7110_timer_driver); > + > +MODULE_AUTHOR("Xingyu Wu <xingyu.wu@starfivetech.com>"); > +MODULE_DESCRIPTION("StarFive JH7110 timer driver"); > +MODULE_LICENSE("GPL"); ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 2/3] clocksource: Add JH7110 timer driver 2023-08-17 8:20 ` Walker Chen @ 2023-09-01 3:07 ` Xingyu Wu 0 siblings, 0 replies; 7+ messages in thread From: Xingyu Wu @ 2023-09-01 3:07 UTC (permalink / raw) To: Walker Chen, Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Samin Guo, linux-kernel, Conor Dooley On 2023/8/17 16:20, Walker Chen wrote: > > > On 2023/8/14 18:16, Xingyu Wu wrote: >> Add timer driver for the StarFive JH7110 SoC. >> >> Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> >> --- >> MAINTAINERS | 7 + >> drivers/clocksource/Kconfig | 11 + >> drivers/clocksource/Makefile | 1 + >> drivers/clocksource/timer-jh7110.c | 415 +++++++++++++++++++++++++++++ >> 4 files changed, 434 insertions(+) >> create mode 100644 drivers/clocksource/timer-jh7110.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 0903d87b17cb..00cf6a22e13c 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -20287,6 +20287,13 @@ S: Maintained >> F: Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml >> F: sound/soc/starfive/jh7110_tdm.c >> >> +STARFIVE JH7110 TIMER DRIVER >> +M: Samin Guo <samin.guo@starfivetech.com> >> +M: Xingyu Wu <xingyu.wu@starfivetech.com> >> +S: Supported >> +F: Documentation/devicetree/bindings/timer/starfive,jh7110-timer.yaml >> +F: drivers/clocksource/timer-jh7110.c >> + >> STARFIVE JH71X0 CLOCK DRIVERS >> M: Emil Renner Berthing <kernel@esmil.dk> >> M: Hal Feng <hal.feng@starfivetech.com> >> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig >> index c4d671a5a13d..171b9b54a499 100644 >> --- a/drivers/clocksource/Kconfig >> +++ b/drivers/clocksource/Kconfig >> @@ -648,6 +648,17 @@ config RISCV_TIMER >> is accessed via both the SBI and the rdcycle instruction. This is >> required for all RISC-V systems. >> >> +config STARFIVE_JH7110_TIMER >> + bool "Timer for the STARFIVE JH7110 SoC" >> + depends on ARCH_STARFIVE || COMPILE_TEST >> + select TIMER_OF >> + select CLKSRC_MMIO >> + default ARCH_STARFIVE >> + help >> + This enables the timer for StarFive JH7110 SoCs. On RISC-V platform, >> + the system has started RISCV_TIMER. But you can also use this timer >> + which can provides four channels to do a lot more on JH7110 SoC. > > Correct some grammar errors as follows: > This enables the timer for StarFive JH7110 SoC. On RISC-V platform, > the system has started RISCV_TIMER, but you can also use this timer > which can provide four channels to do a lot more things on JH7110 SoC. Will fix. > >> + >> config CLINT_TIMER >> bool "CLINT Timer for the RISC-V platform" if COMPILE_TEST >> depends on GENERIC_SCHED_CLOCK && RISCV >> diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile >> index 5d93c9e3fc55..56bd6d9ddd87 100644 >> --- a/drivers/clocksource/Makefile >> +++ b/drivers/clocksource/Makefile >> @@ -81,6 +81,7 @@ obj-$(CONFIG_INGENIC_TIMER) += ingenic-timer.o >> obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o >> obj-$(CONFIG_X86_NUMACHIP) += numachip.o >> obj-$(CONFIG_RISCV_TIMER) += timer-riscv.o >> +obj-$(CONFIG_STARFIVE_JH7110_TIMER) += timer-jh7110.o >> obj-$(CONFIG_CLINT_TIMER) += timer-clint.o >> obj-$(CONFIG_CSKY_MP_TIMER) += timer-mp-csky.o >> obj-$(CONFIG_GX6605S_TIMER) += timer-gx6605s.o >> diff --git a/drivers/clocksource/timer-jh7110.c b/drivers/clocksource/timer-jh7110.c >> new file mode 100644 >> index 000000000000..fe3cfed55df7 >> --- /dev/null >> +++ b/drivers/clocksource/timer-jh7110.c >> @@ -0,0 +1,415 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Starfive JH7110 Timer driver >> + * >> + * Copyright (C) 2022-2023 StarFive Technology Co., Ltd. >> + * >> + * Author: >> + * Xingyu Wu <xingyu.wu@starfivetech.com> >> + * Samin Guo <samin.guo@starfivetech.com> >> + */ >> + >> +#include <linux/clk.h> >> +#include <linux/clockchips.h> >> +#include <linux/clocksource.h> >> +#include <linux/err.h> >> +#include <linux/interrupt.h> >> +#include <linux/io.h> >> +#include <linux/iopoll.h> >> +#include <linux/irq.h> >> +#include <linux/kernel.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/of_device.h> >> +#include <linux/platform_device.h> >> +#include <linux/reset.h> >> +#include <linux/sched_clock.h> >> + >> +/* Bias: Ch0-0x0, Ch1-0x40, Ch2-0x80, and so on. */ >> +#define JH7110_TIMER_CH_LEN 0x40 >> +#define JH7110_TIMER_CH_BASE(x) ((x) * JH7110_TIMER_CH_LEN) >> +#define JH7110_TIMER_CH_MAX 4 >> + >> +#define JH7110_CLOCK_SOURCE_RATING 200 >> +#define JH7110_VALID_BITS 32 >> +#define JH7110_DELAY_US 0 >> +#define JH7110_TIMEOUT_US 10000 >> +#define JH7110_CLOCKEVENT_RATING 300 >> +#define JH7110_TIMER_MAX_TICKS 0xffffffff >> +#define JH7110_TIMER_MIN_TICKS 0xf >> +#define JH7110_TIMER_NAME_NUM 20 >> + >> +#define JH7110_TIMER_INT_STATUS 0x00 /* RO[0:4]: Interrupt Status for channel0~4 */ >> +#define JH7110_TIMER_CTL 0x04 /* RW[0]: 0-continuous run, 1-single run */ >> +#define JH7110_TIMER_LOAD 0x08 /* RW: load value to counter */ >> +#define JH7110_TIMER_ENABLE 0x10 /* RW[0]: timer enable register */ >> +#define JH7110_TIMER_RELOAD 0x14 /* RW: write 1 or 0 both reload counter */ >> +#define JH7110_TIMER_VALUE 0x18 /* RO: timer value register */ >> +#define JH7110_TIMER_INT_CLR 0x20 /* RW: timer interrupt clear register */ >> +#define JH7110_TIMER_INT_MASK 0x24 /* RW[0]: timer interrupt mask register */ >> +#define JH7110_TIMER_INT_CLR_AVA_MASK BIT(1) >> + >> +enum JH7110_TIMER_INTMASK { >> + JH7110_TIMER_INTMASK_DIS = 0, >> + JH7110_TIMER_INTMASK_ENA = 1 >> +}; >> + >> +enum JH7110_TIMER_MOD { >> + JH7110_TIMER_MOD_CONTIN = 0, >> + JH7110_TIMER_MOD_SINGLE = 1 >> +}; >> + >> +enum JH7110_TIMER_CTL_EN { >> + JH7110_TIMER_DIS = 0, >> + JH7110_TIMER_ENA = 1 >> +}; >> + >> +struct jh7110_clkevt { >> + struct clock_event_device evt; >> + struct clocksource cs; >> + struct clk *clk; >> + char name[JH7110_TIMER_NAME_NUM]; >> + int irq; >> + u32 periodic; >> + u32 rate; >> + u32 reload_val; >> + void __iomem *base; >> +}; >> + >> +struct jh7110_timer_priv { >> + struct device *dev; >> + void __iomem *base; >> + struct jh7110_clkevt clkevt[JH7110_TIMER_CH_MAX]; >> +}; >> + >> +static inline struct jh7110_clkevt *to_jh7110_clkevt(struct clock_event_device *evt) >> +{ >> + return container_of(evt, struct jh7110_clkevt, evt); >> +} >> + >> +/* 0:continuous-run mode, 1:single-run mode */ >> +static inline void jh7110_timer_set_continuous_mod(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_MOD_CONTIN, clkevt->base + JH7110_TIMER_CTL); > > Why not write 0 directly? Seems that the macro JH7110_TIMER_MOD_CONTIN is redundant, because the function > name 'jh7110_timer_set_continuous_mod' already expresses its purpose. Will fix and drop the useless macros. The latter is also the same as. > >> +} >> + >> +static inline void jh7110_timer_set_single_mod(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_MOD_SINGLE, clkevt->base + JH7110_TIMER_CTL); > > Same as above. > >> +} >> + >> +/* Interrupt Mask Register, 0:Unmask, 1:Mask */ >> +static inline void jh7110_timer_int_enable(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_INTMASK_DIS, clkevt->base + JH7110_TIMER_INT_MASK); > > Same, the enum variable 'JH7110_TIMER_INTMASK_DIS' is redundant, should be replaced with specific integer value > and drop the definition of enum JH7110_TIMER_INTMASK. > >> +} >> + >> +static inline void jh7110_timer_int_disable(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_INTMASK_ENA, clkevt->base + JH7110_TIMER_INT_MASK); > > Same. > >> +} >> + >> +/* >> + * BIT(0): Read value represent channel intr status. >> + * Write 1 to this bit to clear interrupt. Write 0 has no effects. >> + * BIT(1): "1" means that it is clearing interrupt. BIT(0) can not be written. >> + */ >> +static inline int jh7110_timer_int_clear(struct jh7110_clkevt *clkevt) >> +{ >> + u32 value; >> + int ret; >> + >> + /* waiting interrupt can be to clearing */ >> + ret = readl_poll_timeout_atomic(clkevt->base + JH7110_TIMER_INT_CLR, value, >> + !(value & JH7110_TIMER_INT_CLR_AVA_MASK), >> + JH7110_DELAY_US, JH7110_TIMEOUT_US); >> + if (!ret) >> + writel(0x1, clkevt->base + JH7110_TIMER_INT_CLR); >> + >> + return ret; >> +} >> + >> +/* >> + * The initial value to be loaded into the >> + * counter and is also used as the reload value. >> + * val = clock rate --> 1s >> + */ >> +static inline void jh7110_timer_set_load(struct jh7110_clkevt *clkevt, u32 val) >> +{ >> + writel(val, clkevt->base + JH7110_TIMER_LOAD); >> +} >> + >> +static inline u32 jh7110_timer_get_val(struct jh7110_clkevt *clkevt) >> +{ >> + return readl(clkevt->base + JH7110_TIMER_VALUE); >> +} >> + >> +/* >> + * Write RELOAD register to reload preset value to counter. >> + * Write 0 and write 1 are both ok. >> + */ >> +static inline void jh7110_timer_set_reload(struct jh7110_clkevt *clkevt) >> +{ >> + writel(0, clkevt->base + JH7110_TIMER_RELOAD); >> +} >> + >> +static inline void jh7110_timer_enable(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_ENA, clkevt->base + JH7110_TIMER_ENABLE); > > should be replaced with specific integer value and drop the definition of enum JH7110_TIMER_CTL_EN. > >> +} >> + >> +static inline void jh7110_timer_disable(struct jh7110_clkevt *clkevt) >> +{ >> + writel(JH7110_TIMER_DIS, clkevt->base + JH7110_TIMER_ENABLE); > > Same as above. > >> +} >> + >> +static int jh7110_timer_int_init_enable(struct jh7110_clkevt *clkevt) >> +{ >> + int ret; >> + >> + jh7110_timer_int_disable(clkevt); >> + ret = jh7110_timer_int_clear(clkevt); >> + if (ret) >> + return ret; >> + >> + jh7110_timer_int_enable(clkevt); >> + jh7110_timer_enable(clkevt); >> + >> + return 0; >> +} >> + >> +static int jh7110_timer_shutdown(struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + jh7110_timer_disable(clkevt); >> + return jh7110_timer_int_clear(clkevt); >> +} >> + >> +static void jh7110_timer_suspend(struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + clkevt->reload_val = jh7110_timer_get_val(clkevt); >> + jh7110_timer_shutdown(evt); >> +} >> + >> +static void jh7110_timer_resume(struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + jh7110_timer_set_load(clkevt, clkevt->reload_val); >> + jh7110_timer_set_reload(clkevt); >> + jh7110_timer_int_enable(clkevt); >> + jh7110_timer_enable(clkevt); >> +} >> + >> +static int jh7110_timer_tick_resume(struct clock_event_device *evt) >> +{ >> + jh7110_timer_resume(evt); >> + >> + return 0; >> +} >> + >> +/* IRQ handler for the timer */ >> +static irqreturn_t jh7110_timer_interrupt(int irq, void *priv) >> +{ >> + struct clock_event_device *evt = (struct clock_event_device *)priv; >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + if (jh7110_timer_int_clear(clkevt)) >> + return IRQ_NONE; >> + >> + if (evt->event_handler) >> + evt->event_handler(evt); >> + >> + return IRQ_HANDLED; >> +} >> + >> +static int jh7110_timer_set_periodic(struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + clkevt->periodic = DIV_ROUND_CLOSEST(clkevt->rate, HZ); >> + jh7110_timer_disable(clkevt); >> + jh7110_timer_set_continuous_mod(clkevt); >> + jh7110_timer_set_load(clkevt, clkevt->periodic); >> + >> + return jh7110_timer_int_init_enable(clkevt); >> +} >> + >> +static int jh7110_timer_set_oneshot(struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + jh7110_timer_disable(clkevt); >> + jh7110_timer_set_single_mod(clkevt); >> + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); >> + >> + return jh7110_timer_int_init_enable(clkevt); >> +} >> + >> +static int jh7110_timer_set_next_event(unsigned long next, >> + struct clock_event_device *evt) >> +{ >> + struct jh7110_clkevt *clkevt = to_jh7110_clkevt(evt); >> + >> + jh7110_timer_disable(clkevt); >> + jh7110_timer_set_single_mod(clkevt); >> + jh7110_timer_set_load(clkevt, next); >> + jh7110_timer_enable(clkevt); >> + >> + return 0; >> +} >> + >> +static void jh7110_set_clockevent(struct clock_event_device *evt) >> +{ >> + evt->features = CLOCK_EVT_FEAT_PERIODIC | >> + CLOCK_EVT_FEAT_ONESHOT | >> + CLOCK_EVT_FEAT_DYNIRQ; >> + evt->set_state_shutdown = jh7110_timer_shutdown; >> + evt->set_state_periodic = jh7110_timer_set_periodic; >> + evt->set_state_oneshot = jh7110_timer_set_oneshot; >> + evt->set_state_oneshot_stopped = jh7110_timer_shutdown; >> + evt->tick_resume = jh7110_timer_tick_resume; >> + evt->set_next_event = jh7110_timer_set_next_event; >> + evt->suspend = jh7110_timer_suspend; >> + evt->resume = jh7110_timer_resume; >> + evt->rating = JH7110_CLOCKEVENT_RATING; >> +} >> + >> +static u64 jh7110_timer_clocksource_read(struct clocksource *cs) >> +{ >> + struct jh7110_clkevt *clkevt = container_of(cs, struct jh7110_clkevt, cs); >> + >> + return (u64)jh7110_timer_get_val(clkevt); >> +} >> + >> +static int jh7110_clocksource_init(struct jh7110_clkevt *clkevt) >> +{ >> + int ret; >> + >> + jh7110_timer_set_continuous_mod(clkevt); >> + jh7110_timer_set_load(clkevt, JH7110_TIMER_MAX_TICKS); >> + >> + ret = jh7110_timer_int_init_enable(clkevt); >> + if (ret) >> + return ret; >> + >> + clkevt->cs.name = clkevt->name; >> + clkevt->cs.rating = JH7110_CLOCK_SOURCE_RATING; >> + clkevt->cs.read = jh7110_timer_clocksource_read; >> + clkevt->cs.mask = CLOCKSOURCE_MASK(JH7110_VALID_BITS); >> + clkevt->cs.flags = CLOCK_SOURCE_IS_CONTINUOUS; >> + >> + return clocksource_register_hz(&clkevt->cs, clkevt->rate); >> +} >> + >> +static void jh7110_clockevents_register(struct jh7110_clkevt *clkevt) >> +{ >> + clkevt->rate = clk_get_rate(clkevt->clk); >> + >> + jh7110_set_clockevent(&clkevt->evt); >> + clkevt->evt.name = clkevt->name; >> + clkevt->evt.irq = clkevt->irq; >> + clkevt->evt.cpumask = cpu_possible_mask; >> + >> + clockevents_config_and_register(&clkevt->evt, clkevt->rate, >> + JH7110_TIMER_MIN_TICKS, JH7110_TIMER_MAX_TICKS); >> +} >> + >> +static int jh7110_timer_probe(struct platform_device *pdev) >> +{ >> + char name[JH7110_TIMER_NAME_NUM]; >> + struct jh7110_timer_priv *priv; >> + struct jh7110_clkevt *clkevt; >> + struct clk *pclk; >> + struct reset_control *rst; >> + int ch; >> + int ret; >> + >> + priv = devm_kzalloc(&pdev->dev, struct_size(priv, clkevt, JH7110_TIMER_CH_MAX), >> + GFP_KERNEL); >> + if (!priv) >> + return -ENOMEM; >> + >> + priv->base = devm_platform_ioremap_resource(pdev, 0); >> + if (IS_ERR(priv->base)) >> + return dev_err_probe(&pdev->dev, PTR_ERR(priv->base), >> + "failed to map registers\n"); >> + >> + rst = devm_reset_control_get_exclusive(&pdev->dev, "apb"); >> + if (IS_ERR(rst)) >> + return dev_err_probe(&pdev->dev, PTR_ERR(rst), "failed to get apb reset\n"); >> + >> + pclk = devm_clk_get_enabled(&pdev->dev, "apb"); >> + if (IS_ERR(pclk)) >> + return dev_err_probe(&pdev->dev, PTR_ERR(pclk), >> + "failed to get & enable apb clock\n"); >> + >> + ret = reset_control_deassert(rst); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, "failed to deassert apb reset\n"); >> + >> + priv->dev = &pdev->dev; >> + platform_set_drvdata(pdev, priv); >> + >> + for (ch = 0; ch < JH7110_TIMER_CH_MAX; ch++) { >> + clkevt = &priv->clkevt[ch]; >> + snprintf(name, sizeof(name), "ch%d", ch); >> + >> + clkevt->base = priv->base + JH7110_TIMER_CH_BASE(ch); >> + /* Ensure timers are disabled */ >> + jh7110_timer_disable(clkevt); >> + >> + rst = devm_reset_control_get_exclusive(&pdev->dev, name); >> + if (IS_ERR(rst)) >> + return PTR_ERR(rst); >> + >> + clkevt->clk = devm_clk_get_enabled(&pdev->dev, name); >> + if (IS_ERR(clkevt->clk)) >> + return PTR_ERR(clkevt->clk); >> + >> + ret = reset_control_deassert(rst); >> + if (ret) >> + return ret; >> + >> + clkevt->irq = platform_get_irq(pdev, ch); >> + if (clkevt->irq < 0) >> + return clkevt->irq; >> + >> + snprintf(clkevt->name, sizeof(clkevt->name), "%s.ch%d", pdev->name, ch); >> + jh7110_clockevents_register(clkevt); >> + >> + ret = devm_request_irq(&pdev->dev, clkevt->irq, jh7110_timer_interrupt, >> + IRQF_TIMER | IRQF_IRQPOLL, >> + clkevt->name, &clkevt->evt); >> + if (ret) >> + return ret; >> + >> + ret = jh7110_clocksource_init(clkevt); >> + if (ret) >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static const struct of_device_id jh7110_timer_match[] = { >> + { .compatible = "starfive,jh7110-timer", }, >> + { /* sentinel */ } >> +}; >> +MODULE_DEVICE_TABLE(of, jh7110_timer_match); >> + >> +static struct platform_driver jh7110_timer_driver = { >> + .probe = jh7110_timer_probe, >> + .driver = { >> + .name = "jh7110-timer", >> + .of_match_table = jh7110_timer_match, >> + }, >> +}; >> +module_platform_driver(jh7110_timer_driver); >> + >> +MODULE_AUTHOR("Xingyu Wu <xingyu.wu@starfivetech.com>"); >> +MODULE_DESCRIPTION("StarFive JH7110 timer driver"); >> +MODULE_LICENSE("GPL"); Thanks, Xingyu Wu ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node 2023-08-14 10:16 [PATCH v4 0/3] Add timer driver for StarFive JH7110 RISC-V SoC Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 1/3] dt-bindings: timer: Add timer for StarFive JH7110 SoC Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 2/3] clocksource: Add JH7110 timer driver Xingyu Wu @ 2023-08-14 10:16 ` Xingyu Wu 2023-08-17 8:27 ` Walker Chen 2 siblings, 1 reply; 7+ messages in thread From: Xingyu Wu @ 2023-08-14 10:16 UTC (permalink / raw) To: Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Xingyu Wu, Samin Guo, linux-kernel, Conor Dooley Add the timer node for the Starfive JH7110 SoC. Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> --- arch/riscv/boot/dts/starfive/jh7110.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index ec2e70011a73..84bb9717be13 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -502,6 +502,26 @@ sysgpio: pinctrl@13040000 { #gpio-cells = <2>; }; + timer@13050000 { + compatible = "starfive,jh7110-timer"; + reg = <0x0 0x13050000 0x0 0x10000>; + interrupts = <69>, <70>, <71> ,<72>; + clocks = <&syscrg JH7110_SYSCLK_TIMER_APB>, + <&syscrg JH7110_SYSCLK_TIMER0>, + <&syscrg JH7110_SYSCLK_TIMER1>, + <&syscrg JH7110_SYSCLK_TIMER2>, + <&syscrg JH7110_SYSCLK_TIMER3>; + clock-names = "apb", "ch0", "ch1", + "ch2", "ch3"; + resets = <&syscrg JH7110_SYSRST_TIMER_APB>, + <&syscrg JH7110_SYSRST_TIMER0>, + <&syscrg JH7110_SYSRST_TIMER1>, + <&syscrg JH7110_SYSRST_TIMER2>, + <&syscrg JH7110_SYSRST_TIMER3>; + reset-names = "apb", "ch0", "ch1", + "ch2", "ch3"; + }; + watchdog@13070000 { compatible = "starfive,jh7110-wdt"; reg = <0x0 0x13070000 0x0 0x10000>; -- 2.25.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node 2023-08-14 10:16 ` [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node Xingyu Wu @ 2023-08-17 8:27 ` Walker Chen 0 siblings, 0 replies; 7+ messages in thread From: Walker Chen @ 2023-08-17 8:27 UTC (permalink / raw) To: Xingyu Wu, Daniel Lezcano, Thomas Gleixner, Emil Renner Berthing Cc: linux-riscv, devicetree, Rob Herring, Krzysztof Kozlowski, Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel, Samin Guo, linux-kernel, Conor Dooley On 2023/8/14 18:16, Xingyu Wu wrote: > Add the timer node for the Starfive JH7110 SoC. > > Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> > --- > arch/riscv/boot/dts/starfive/jh7110.dtsi | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > index ec2e70011a73..84bb9717be13 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > @@ -502,6 +502,26 @@ sysgpio: pinctrl@13040000 { > #gpio-cells = <2>; > }; > > + timer@13050000 { > + compatible = "starfive,jh7110-timer"; > + reg = <0x0 0x13050000 0x0 0x10000>; > + interrupts = <69>, <70>, <71> ,<72>; > + clocks = <&syscrg JH7110_SYSCLK_TIMER_APB>, > + <&syscrg JH7110_SYSCLK_TIMER0>, > + <&syscrg JH7110_SYSCLK_TIMER1>, > + <&syscrg JH7110_SYSCLK_TIMER2>, > + <&syscrg JH7110_SYSCLK_TIMER3>; > + clock-names = "apb", "ch0", "ch1", > + "ch2", "ch3"; > + resets = <&syscrg JH7110_SYSRST_TIMER_APB>, > + <&syscrg JH7110_SYSRST_TIMER0>, > + <&syscrg JH7110_SYSRST_TIMER1>, > + <&syscrg JH7110_SYSRST_TIMER2>, > + <&syscrg JH7110_SYSRST_TIMER3>; > + reset-names = "apb", "ch0", "ch1", > + "ch2", "ch3"; > + }; > + > watchdog@13070000 { > compatible = "starfive,jh7110-wdt"; > reg = <0x0 0x13070000 0x0 0x10000>; Reviewed-by: Walker Chen <walker.chen@starfivetech.com> Thanks! ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-09-01 3:12 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-08-14 10:16 [PATCH v4 0/3] Add timer driver for StarFive JH7110 RISC-V SoC Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 1/3] dt-bindings: timer: Add timer for StarFive JH7110 SoC Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 2/3] clocksource: Add JH7110 timer driver Xingyu Wu 2023-08-17 8:20 ` Walker Chen 2023-09-01 3:07 ` Xingyu Wu 2023-08-14 10:16 ` [PATCH v4 3/3] riscv: dts: jh7110: starfive: Add timer node Xingyu Wu 2023-08-17 8:27 ` Walker Chen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).