timers drivers v5.5
Subsystems (7)
The following changes since commit 08a3c192c93f4359a94bf47971e55b0324b72b8b:
posix-timers: Prepare for PREEMPT_RT (2019-08-01 20:51:25 +0200)
are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.5
for you to fetch changes up to befd04abfbe4b933515dddb5659d0744be9dba6a:
clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated
(2019-08-23 07:38:34 +0200)
----------------------------------------------------------------
- Remove dev_err() when used with platform_get_irq (Stephen Boyd)
- Add DT binding and new compatible for Allwinner sun4i (Maxime Ripard)
- Register the Atmel tcb clocksource for delays (Alexandre Belloni)
- Add a clock divider for the Freescale imx platforms and new timer node in the DT (Anson Huang)
- Use DIV_ROUND_CLOSEST macro for the Renesas OSTM (Geert Uytterhoeven)
- Fix GENMASK and timer operation for the npcm timer (Avi Fishman)
- Fix timer-of showing an error message when EPROBE_DEFER is returned (Jon Hunter)
- Add new SoC DT binding and match for Renesas timers (Magnus Damm)
----------------------------------------------------------------
Alexandre Belloni (1):
clocksource/drivers/tcb_clksrc: Register delay timer
Anson Huang (3):
clocksource/drivers/imx-sysctr: Add internal clock divider handle
arm64: dts: imx8mm: Add system counter node
arm64: dts: imx8mq: Add system counter node
Avi Fishman (1):
clocksource/drivers/npcm: Fix GENMASK and timer operation
Geert Uytterhoeven (1):
clocksource/drivers/renesas-ostm: Use DIV_ROUND_CLOSEST() helper
Jon Hunter (2):
clocksource/drivers/timer-of: Do not warn on deferred probe clocksource/drivers: Do not warn on probe defer
Magnus Damm (7):
dt-bindings: timer: renesas, cmt: Add CMT0234 to sh73a0 and r8a7740
dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a7792
dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a77995
dt-bindings: timer: renesas, cmt: Update R-Car Gen3 CMT1 usage clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated
Maxime Ripard (4):
dt-bindings: timer: Convert Allwinner A10 Timer to a schema
dt-bindings: timer: Add missing compatibles
clocksource: sun4i: Add missing compatibles
dt-bindings: timer: Convert Allwinner A13 HSTimer to a schema
Stephen Boyd (1):
clocksource: Remove dev_err() usage after platform_get_irq()
.../bindings/timer/allwinner,sun4i-a10-timer.yaml | 102 +++++++++++++++++++++ .../bindings/timer/allwinner,sun4i-timer.txt | 19 ---- .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 26 ------ .../timer/allwinner,sun5i-a13-hstimer.yaml | 79 ++++++++++++++++ .../devicetree/bindings/timer/renesas,cmt.txt | 40 ++++---- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 ++ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 ++ drivers/clocksource/Kconfig | 2 +- drivers/clocksource/em_sti.c | 4 +- drivers/clocksource/renesas-ostm.c | 2 +- drivers/clocksource/sh_cmt.c | 19 +++- drivers/clocksource/sh_tmu.c | 5 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++ drivers/clocksource/timer-imx-sysctr.c | 5 + drivers/clocksource/timer-npcm7xx.c | 9 +- drivers/clocksource/timer-of.c | 6 +- drivers/clocksource/timer-probe.c | 4 +- drivers/clocksource/timer-sun4i.c | 4 + 18 files changed, 275 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt create mode 100644
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 1/20 clocksource: Remove dev_err() usage after platform_get_irq()
From: Stephen Boyd <[email protected]>
We don't need dev_err() messages when platform_get_irq() fails now that platform_get_irq() prints an error message itself when something goes wrong. Let's remove these prints with a simple semantic patch.
// <smpl>
@@
expression ret;
struct platform_device *E;
@@
ret =
(platform_get_irq(E, ...)
|platform_get_irq_byname(E, ...)
);
if ( \( ret < 0 \| ret <= 0 \) )
{
(
-if (ret != -EPROBE_DEFER)
-{ ...
-dev_err(...);
-... }
|
...
-dev_err(...);
)
...
}
// </smpl>
While we're here, remove braces on if statements that only have one statement (manually).
--- drivers/clocksource/em_sti.c | 4 +--- drivers/clocksource/sh_cmt.c | 5 +---- drivers/clocksource/sh_tmu.c | 5 +---- 3 files changed, 3 insertions(+), 11 deletions(-)
drivers/clocksource/em_sti.c +1 -3
@@ -291,10 +291,8 @@ static int em_sti_probe(struct platform_device *pdev)platform_set_drvdata (pdev, p); irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { -dev_err (&pdev->dev,"failed to get irq\n" ); +if (irq <0 )return irq; - }/* map memory, let base point to the STI instance */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
drivers/clocksource/sh_cmt.c +1 -4
@@ -776,11 +776,8 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,int ret; irq =platform_get_irq (ch->cmt->pdev, ch->index); -if (irq <0 ) { -dev_err (&ch->cmt->pdev->dev,"ch%u: failed to get irq\n" , - ch->index); +if (irq <0 )return irq; - } ret = request_irq(irq, sh_cmt_interrupt, IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
drivers/clocksource/sh_tmu.c +1 -4
@@ -462,11 +462,8 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, ch->base = tmu->mapbase +8 + ch->index *12 ; ch->irq =platform_get_irq (tmu->pdev, index); -if (ch->irq <0 ) { -dev_err (&tmu->pdev->dev,"ch%u: failed to get irq\n" , - ch->index); +if (ch->irq <0 )return ch->irq; - } ch->cs_enabled = false; ch->enable_count =0 ;
Signature · 1 line
2.17.1
PATCH 2/20 dt-bindings: timer: Convert Allwinner A10 Timer to a schema
From: Maxime Ripard <[email protected]>
The older Allwinner SoCs have a Timer supported in Linux, with a matching Device Tree binding.
While the original binding only mentions one interrupt, the timer actually has 6 of them.
Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas.
--- .../timer/allwinner,sun4i-a10-timer.yaml | 76 +++++++++++++++++++ .../bindings/timer/allwinner,sun4i-timer.txt | 19 ----- 2 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt
Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml new file +76 -0
@@ -0,0 +1,76 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/allwinner,sun4i-a10-timer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A10 Timer Device Tree Bindings + +maintainers: + - Chen-Yu Tsai <[email protected]> + - Maxime Ripard <[email protected]> + +properties: + compatible: + enum: + - allwinner,sun4i-a10-timer + - allwinner,suniv-f1c100s-timer + + reg: + maxItems: 1 + + interrupts: + description: + List of timers interrupts + + clocks: + maxItems: 1 + +allOf: + - if: + properties: + compatible: + items: + const: allwinner,sun4i-a10-timer + + then: + properties: + interrupts: + minItems: 6 + maxItems: 6 + + - if: + properties: + compatible: + items: + const: allwinner,suniv-f1c100s-timer + + then: + properties: + interrupts: + minItems: 3 + maxItems: 3 + +required: + - compatible + - reg + - interrupts + - clocks + +additionalProperties: false + +examples: + - | + timer { + compatible = "allwinner,sun4i-a10-timer"; + reg = <0x01c20c00 0x400>; + interrupts = <22>, + <23>, + <24>, + <25>, + <67>, + <68>; + clocks = <&osc>; + }; + +...
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt deleted +0 -19
@@ -1,19 +0,0 @@ -Allwinner A1X SoCs Timer Controller - -Required properties: - -- compatible : should be one of the following: - "allwinner,sun4i-a10-timer" - "allwinner,suniv-f1c100s-timer" -- reg : Specifies base physical address and size of the registers. -- interrupts : The interrupt of the first timer -- clocks: phandle to the source clock (usually a 24 MHz fixed clock) - -Example: - -timer { - compatible = "allwinner,sun4i-a10-timer"; - reg = <0x01c20c00 0x400>; - interrupts = <22>; - clocks = <&osc>; -};
Signature · 1 line
2.17.1
PATCH 3/20 dt-bindings: timer: Add missing compatibles
In reply to Daniel LezcanoFrom: Maxime Ripard <[email protected]>
Newer Allwinner SoCs have different number of interrupts, let's add different compatibles for all of them to deal with this properly.
--- .../timer/allwinner,sun4i-a10-timer.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+)
Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml +26 -0
@@ -14,6 +14,8 @@ properties: compatible: enum: - allwinner,sun4i-a10-timer + - allwinner,sun8i-a23-timer + - allwinner,sun8i-v3s-timer - allwinner,suniv-f1c100s-timer reg:
@@ -39,6 +41,30 @@ allOf: minItems: 6 maxItems: 6 + - if: + properties: + compatible: + items: + const: allwinner,sun8i-a23-timer + + then: + properties: + interrupts: + minItems: 2 + maxItems: 2 + + - if: + properties: + compatible: + items: + const: allwinner,sun8i-v3s-timer + + then: + properties: + interrupts: + minItems: 3 + maxItems: 3 + - if: properties: compatible:
Signature · 1 line
2.17.1
PATCH 4/20 clocksource: sun4i: Add missing compatibles
In reply to Daniel LezcanoFrom: Maxime Ripard <[email protected]>
Newer Allwinner SoCs have different number of interrupts, let's add different compatibles for all of them to deal with this properly.
--- drivers/clocksource/timer-sun4i.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clocksource/timer-sun4i.c +4 -0
@@ -219,5 +219,9 @@ static int __init sun4i_timer_init(struct device_node *node) }TIMER_OF_DECLARE (sun4i,"allwinner,sun4i-a10-timer" , sun4i_timer_init); +TIMER_OF_DECLARE (sun8i_a23,"allwinner,sun8i-a23-timer" , + sun4i_timer_init); +TIMER_OF_DECLARE (sun8i_v3s,"allwinner,sun8i-v3s-timer" , + sun4i_timer_init);TIMER_OF_DECLARE (suniv,"allwinner,suniv-f1c100s-timer" , sun4i_timer_init);
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 5/20 dt-bindings: timer: Convert Allwinner A13 HSTimer to a schema
In reply to Daniel LezcanoFrom: Maxime Ripard <[email protected]>
The newer Allwinner SoCs have a High Speed Timer supported in Linux, with a matching Device Tree binding.
Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas.
--- .../timer/allwinner,sun5i-a13-hstimer.txt | 26 ------ .../timer/allwinner,sun5i-a13-hstimer.yaml | 79 +++++++++++++++++++ 2 files changed, 79 insertions(+), 26 deletions(-) delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt deleted +0 -26
@@ -1,26 +0,0 @@ -Allwinner SoCs High Speed Timer Controller - -Required properties: - -- compatible : should be "allwinner,sun5i-a13-hstimer" or - "allwinner,sun7i-a20-hstimer" -- reg : Specifies base physical address and size of the registers. -- interrupts : The interrupts of these timers (2 for the sun5i IP, 4 for the sun7i - one) -- clocks: phandle to the source clock (usually the AHB clock) - -Optional properties: -- resets: phandle to a reset controller asserting the timer - -Example: - -timer@1c60000 { - compatible = "allwinner,sun7i-a20-hstimer"; - reg = <0x01c60000 0x1000>; - interrupts = <0 51 1>, - <0 52 1>, - <0 53 1>, - <0 54 1>; - clocks = <&ahb1_gates 19>; - resets = <&ahb1rst 19>; -};
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 6/20 clocksource/drivers/tcb_clksrc: Register delay timer
In reply to Daniel LezcanoFrom: Alexandre Belloni <[email protected]>
Implement and register delay timer to allow get_cycles() to work properly.
--- drivers/clocksource/Kconfig | 2 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/clocksource/Kconfig +1 -1
@@ -429,7 +429,7 @@ config ATMEL_ST config ATMEL_TCB_CLKSRC bool "Atmel TC Block timer driver" if COMPILE_TEST - depends on HAS_IOMEM + depends on ARM && HAS_IOMEM select TIMER_OF if OF help Support for Timer Counter Blocks on Atmel SoCs.
drivers/clocksource/timer-atmel-tcb.c +18 -0
@@ -6,6 +6,7 @@#include <linux/irq.h> #include <linux/clk.h> +#include <linux/delay.h> #include <linux/err.h> #include <linux/ioport.h> #include <linux/io.h>
@@ -125,6 +126,18 @@ static u64 notrace tc_sched_clock_read32(void)return tc_get_cycles32 (&clksrc); } +static struct delay_timer tc_delay_timer; + +static unsigned long tc_delay_timer_read (void ) +{ +return tc_get_cycles (&clksrc); +} + +static unsigned long notrace tc_delay_timer_read32 (void ) +{ +return tc_get_cycles32 (&clksrc); +} +#ifdef CONFIG_GENERIC_CLOCKEVENTS struct tc_clkevt_device {
@@ -432,6 +445,7 @@ static int __init tcb_clksrc_init(struct device_node *node)/* setup ony channel 0 */ tcb_setup_single_chan (&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read32; + tc_delay_timer.read_current_timer = tc_delay_timer_read32; }else {/* we have three clocks no matter what the * underlying platform supports.
@@ -444,6 +458,7 @@ static int __init tcb_clksrc_init(struct device_node *node)/* setup both channel 0 & 1 */ tcb_setup_dual_chan (&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read; + tc_delay_timer.read_current_timer = tc_delay_timer_read; }/* and away we go! */
@@ -458,6 +473,9 @@ static int __init tcb_clksrc_init(struct device_node *node)sched_clock_register (tc_sched_clock,32 , divided_rate); + tc_delay_timer.freq = divided_rate; +register_current_timer_delay (&tc_delay_timer); +return 0 ; err_unregister_clksrc:
Signature · 1 line
2.17.1
PATCH 7/20 clocksource/drivers/imx-sysctr: Add internal clock divider handle
In reply to Daniel LezcanoFrom: Anson Huang <[email protected]>
The system counter block guide states that the base clock is internally divided by 3 before use, that means the clock input of system counter defined in DT should be base clock which is normally from OSC, and then internally divided by 3 before use.
--- drivers/clocksource/timer-imx-sysctr.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/clocksource/timer-imx-sysctr.c +5 -0
@@ -20,6 +20,8 @@#define SYS_CTR_EN 0x1#define SYS_CTR_IRQ_MASK 0x2 +#define SYS_CTR_CLK_DIV 0x3 +static void __iomem *sys_ctr_base;static u32 cmpcr;
@@ -134,6 +136,9 @@ static int __init sysctr_timer_init(struct device_node *np)if (ret)return ret; +/* system counter clock is divided by 3 internally */ + to_sysctr.of_clk.rate /=SYS_CTR_CLK_DIV ; + sys_ctr_base =timer_of_base (&to_sysctr); cmpcr =readl (sys_ctr_base +CMPCR ); cmpcr &= ~SYS_CTR_EN ;
Signature · 1 line
2.17.1
PATCH 8/20 arm64: dts: imx8mm: Add system counter node
In reply to Daniel LezcanoFrom: Anson Huang <[email protected]>
Add i.MX8MM system counter node to enable timer-imx-sysctr broadcast timer driver.
--- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/freescale/imx8mm.dtsi +8 -0
@@ -510,6 +510,14 @@ #pwm-cells = <2>; status = "disabled"; }; + + system_counter: timer@306a0000 { + compatible = "nxp,sysctr-timer"; + reg = <0x306a0000 0x20000>; + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&osc_24m>; + clock-names = "per"; + }; }; aips3: bus@30800000 {
Signature · 1 line
2.17.1
PATCH 9/20 arm64: dts: imx8mq: Add system counter node
In reply to Daniel LezcanoFrom: Anson Huang <[email protected]>
Add i.MX8MQ system counter node to enable timer-imx-sysctr broadcast timer driver.
--- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0
@@ -635,6 +635,14 @@ #pwm-cells = <2>; status = "disabled"; }; + + system_counter: timer@306a0000 { + compatible = "nxp,sysctr-timer"; + reg = <0x306a0000 0x20000>; + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&osc_25m>; + clock-names = "per"; + }; }; bus@30800000 { /* AIPS3 */
Signature · 1 line
2.17.1
PATCH 10/20 clocksource/drivers/renesas-ostm: Use DIV_ROUND_CLOSEST() helper
In reply to Daniel LezcanoFrom: Geert Uytterhoeven <[email protected]>
Use the DIV_ROUND_CLOSEST() helper instead of open-coding the same operation.
--- drivers/clocksource/renesas-ostm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/renesas-ostm.c +1 -1
@@ -221,7 +221,7 @@ static int __init ostm_init(struct device_node *np) } rate =clk_get_rate (ostm_clk); - ostm->ticks_per_jiffy = (rate +HZ /2 ) /HZ ; + ostm->ticks_per_jiffy =DIV_ROUND_CLOSEST (rate,HZ );/* * First probed device will be used as system clocksource. Any
Signature · 1 line
2.17.1
PATCH 11/20 clocksource/drivers/npcm: Fix GENMASK and timer operation
In reply to Daniel LezcanoFrom: Avi Fishman <[email protected]>
NPCM7XX_Tx_OPER GENMASK bits are wrong, fix them.
Hopefully the NPCM7XX_REG_TICR0 register reset value of those bits was 0, so it did not cause an issue.
The function npcm7xx_timer_oneshot() reads the register NPCM7XX_REG_TCSR0, modifies it and then reads it again overwriting the previous changes. Remove the extra read which is pointless.
The function npcm7xx_timer_periodic() is correct but the code writes to the NPCM7XX_REG_TICR0 register while it is dealing with the NPCM7XX_REG_TCSR0 register, that is confusing. Separate the write to the registers in the code for the sake of clarity.
--- drivers/clocksource/timer-npcm7xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/clocksource/timer-npcm7xx.c +3 -6
@@ -32,7 +32,7 @@#define NPCM7XX_Tx_INTEN BIT(29)#define NPCM7XX_Tx_COUNTEN BIT(30)#define NPCM7XX_Tx_ONESHOT 0x0 -#define NPCM7XX_Tx_OPER GENMASK(27, 3) +#define NPCM7XX_Tx_OPER GENMASK(28, 27)#define NPCM7XX_Tx_MIN_PRESCALE 0x1#define NPCM7XX_Tx_TDR_MASK_BITS 24#define NPCM7XX_Tx_MAX_CNT 0xFFFFFF
@@ -84,8 +84,6 @@ static int npcm7xx_timer_oneshot(struct clock_event_device *evt) val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - - val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val |= NPCM7XX_START_ONESHOT_Tx;writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );
@@ -97,12 +95,11 @@ static int npcm7xx_timer_periodic(struct clock_event_device *evt)struct timer_of *to =to_timer_of (evt);u32 val; +writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); + val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - -writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); val |= NPCM7XX_START_PERIODIC_Tx; -writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );return 0 ;
Signature · 1 line
2.17.1
PATCH 12/20 clocksource/drivers/timer-of: Do not warn on deferred probe
In reply to Daniel LezcanoFrom: Jon Hunter <[email protected]>
Deferred probe is an expected return value for clk_get() on many platforms. The driver deals with it properly, so there's no need to output a warning that may potentially confuse users.
--- drivers/clocksource/timer-of.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/timer-of.c +4 -2
@@ -113,8 +113,10 @@ static __init int timer_of_clk_init(struct device_node *np, of_clk->clk = of_clk->name ?of_clk_get_by_name (np, of_clk->name) :of_clk_get (np, of_clk->index);if (IS_ERR (of_clk->clk)) { -pr_err ("Failed to get clock for %pOF\n" , np); -return PTR_ERR (of_clk->clk); + ret =PTR_ERR (of_clk->clk); +if (ret != -EPROBE_DEFER ) +pr_err ("Failed to get clock for %pOF\n" , np); + goto out; } ret =clk_prepare_enable (of_clk->clk);
Signature · 1 line
2.17.1
PATCH 13/20 clocksource/drivers: Do not warn on probe defer
In reply to Daniel LezcanoFrom: Jon Hunter <[email protected]>
Deferred probe is an expected return value on many platforms and so there's no need to output a warning that may potentially confuse users.
--- drivers/clocksource/timer-probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clocksource/timer-probe.c +3 -1
@@ -29,7 +29,9 @@ void __init timer_probe(void) ret =init_func_ret (np);if (ret) { -pr_err ("Failed to initialize '%pOF': %d\n" , np, ret); +if (ret != -EPROBE_DEFER ) +pr_err ("Failed to initialize '%pOF': %d\n" , np, + ret);continue ; }
Signature · 1 line
2.17.1
PATCH 14/20 dt-bindings: timer: renesas, cmt: Add CMT0234 to sh73a0 and r8a7740
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
Document the on-chip CMT devices included in r8a7740 and sh73a0.
Included in this patch is DT binding documentation for 32-bit CMTs CMT0, CMT2, CMT3 and CMT4. They all contain a single channel and are quite similar however some minor differences still exist:
- "Counter input clock" (clock input and on-device divider) One example is that RCLK 1/1 is supported by CMT2, CMT3 and CMT4.
- "Wakeup request" (supported by CMT0 and CMT2)
Because of this one unique compat string per CMT device is selected.
--- Documentation/devicetree/bindings/timer/renesas,cmt.txt | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/timer/renesas,cmt.txt +8 -0
@@ -22,6 +22,10 @@ Required Properties: - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4. - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4. + - "renesas,r8a7740-cmt0" for the 32-bit CMT0 device included in r8a7740. + - "renesas,r8a7740-cmt2" for the 32-bit CMT2 device included in r8a7740. + - "renesas,r8a7740-cmt3" for the 32-bit CMT3 device included in r8a7740. + - "renesas,r8a7740-cmt4" for the 32-bit CMT4 device included in r8a7740. - "renesas,r8a7743-cmt0" for the 32-bit CMT0 device included in r8a7743. - "renesas,r8a7743-cmt1" for the 48-bit CMT1 device included in r8a7743. - "renesas,r8a7744-cmt0" for the 32-bit CMT0 device included in r8a7744.
@@ -54,6 +58,10 @@ Required Properties: - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980. - "renesas,r8a77990-cmt0" for the 32-bit CMT0 device included in r8a77990. - "renesas,r8a77990-cmt1" for the 48-bit CMT1 device included in r8a77990. + - "renesas,sh73a0-cmt0" for the 32-bit CMT0 device included in sh73a0. + - "renesas,sh73a0-cmt2" for the 32-bit CMT2 device included in sh73a0. + - "renesas,sh73a0-cmt3" for the 32-bit CMT3 device included in sh73a0. + - "renesas,sh73a0-cmt4" for the 32-bit CMT4 device included in sh73a0. - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2 and RZ/G1.
Signature · 1 line
2.17.1
PATCH 15/20 dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
This patch reworks the DT binding documentation for the 6-channel 48-bit CMTs known as CMT1 on r8a7740 and sh73a0.
After the update the same style of DT binding as the rest of the upstream SoCs will now also be used by r8a7740 and sh73a0. The DT binding "cmt-48" is removed from the DT binding documentation, however software support for this deprecated binding will still remain in the CMT driver for some time.
--- .../devicetree/bindings/timer/renesas,cmt.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/timer/renesas,cmt.txt +2 -8
@@ -12,17 +12,10 @@ datasheets. Required Properties: - compatible: must contain one or more of the following: - - "renesas,cmt-48-sh73a0" for the sh73A0 48-bit CMT - (CMT1) - - "renesas,cmt-48-r8a7740" for the r8a7740 48-bit CMT - (CMT1) - - "renesas,cmt-48" for all non-second generation 48-bit CMT - (CMT1 on sh73a0 and r8a7740) - This is a fallback for the above renesas,cmt-48-* entries. - - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4. - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4. - "renesas,r8a7740-cmt0" for the 32-bit CMT0 device included in r8a7740. + - "renesas,r8a7740-cmt1" for the 48-bit CMT1 device included in r8a7740. - "renesas,r8a7740-cmt2" for the 32-bit CMT2 device included in r8a7740. - "renesas,r8a7740-cmt3" for the 32-bit CMT3 device included in r8a7740. - "renesas,r8a7740-cmt4" for the 32-bit CMT4 device included in r8a7740.
@@ -59,6 +52,7 @@ Required Properties: - "renesas,r8a77990-cmt0" for the 32-bit CMT0 device included in r8a77990. - "renesas,r8a77990-cmt1" for the 48-bit CMT1 device included in r8a77990. - "renesas,sh73a0-cmt0" for the 32-bit CMT0 device included in sh73a0. + - "renesas,sh73a0-cmt1" for the 48-bit CMT1 device included in sh73a0. - "renesas,sh73a0-cmt2" for the 32-bit CMT2 device included in sh73a0. - "renesas,sh73a0-cmt3" for the 32-bit CMT3 device included in sh73a0. - "renesas,sh73a0-cmt4" for the 32-bit CMT4 device included in sh73a0.
Signature · 1 line
2.17.1
PATCH 16/20 dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a7792
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
This patch adds DT binding documentation for the CMT devices on the R-Car Gen2 V2H (r8a7792) SoC.
--- Documentation/devicetree/bindings/timer/renesas,cmt.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/timer/renesas,cmt.txt +2 -0
@@ -35,6 +35,8 @@ Required Properties: - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790. - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791. - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791. + - "renesas,r8a7792-cmt0" for the 32-bit CMT0 device included in r8a7792. + - "renesas,r8a7792-cmt1" for the 48-bit CMT1 device included in r8a7792. - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793. - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793. - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.
Signature · 1 line
2.17.1
PATCH 17/20 dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a77995
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
This patch adds DT binding documentation for the CMT devices on the R-Car Gen3 D3 (r8a77995) SoC.
--- Documentation/devicetree/bindings/timer/renesas,cmt.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/timer/renesas,cmt.txt +2 -0
@@ -53,6 +53,8 @@ Required Properties: - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980. - "renesas,r8a77990-cmt0" for the 32-bit CMT0 device included in r8a77990. - "renesas,r8a77990-cmt1" for the 48-bit CMT1 device included in r8a77990. + - "renesas,r8a77995-cmt0" for the 32-bit CMT0 device included in r8a77995. + - "renesas,r8a77995-cmt1" for the 48-bit CMT1 device included in r8a77995. - "renesas,sh73a0-cmt0" for the 32-bit CMT0 device included in sh73a0. - "renesas,sh73a0-cmt1" for the 48-bit CMT1 device included in sh73a0. - "renesas,sh73a0-cmt2" for the 32-bit CMT2 device included in sh73a0.
Signature · 1 line
2.17.1
PATCH 18/20 dt-bindings: timer: renesas, cmt: Update R-Car Gen3 CMT1 usage
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
The R-Car Gen3 SoCs so far come with a total for 4 on-chip CMT devices:
- CMT0
- CMT1
- CMT2
- CMT3
CMT0 includes two rather basic 32-bit timer channels. The rest of the on-chip CMT devices support 48-bit counters and have 8 channels each.
Based on the data sheet information "CMT2/3 are exactly same as CMT1" it seems that CMT2 and CMT3 now use the CMT1 compat string in the DTSI.
Clarify this in the DT binding documentation by describing R-Car Gen3 and RZ/G2 CMT1 as "48-bit CMT devices".
--- .../devicetree/bindings/timer/renesas,cmt.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/timer/renesas,cmt.txt +10 -10
@@ -28,9 +28,9 @@ Required Properties: - "renesas,r8a77470-cmt0" for the 32-bit CMT0 device included in r8a77470. - "renesas,r8a77470-cmt1" for the 48-bit CMT1 device included in r8a77470. - "renesas,r8a774a1-cmt0" for the 32-bit CMT0 device included in r8a774a1. - - "renesas,r8a774a1-cmt1" for the 48-bit CMT1 device included in r8a774a1. + - "renesas,r8a774a1-cmt1" for the 48-bit CMT devices included in r8a774a1. - "renesas,r8a774c0-cmt0" for the 32-bit CMT0 device included in r8a774c0. - - "renesas,r8a774c0-cmt1" for the 48-bit CMT1 device included in r8a774c0. + - "renesas,r8a774c0-cmt1" for the 48-bit CMT devices included in r8a774c0. - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790. - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790. - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791.
@@ -42,19 +42,19 @@ Required Properties: - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794. - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794. - "renesas,r8a7795-cmt0" for the 32-bit CMT0 device included in r8a7795. - - "renesas,r8a7795-cmt1" for the 48-bit CMT1 device included in r8a7795. + - "renesas,r8a7795-cmt1" for the 48-bit CMT devices included in r8a7795. - "renesas,r8a7796-cmt0" for the 32-bit CMT0 device included in r8a7796. - - "renesas,r8a7796-cmt1" for the 48-bit CMT1 device included in r8a7796. + - "renesas,r8a7796-cmt1" for the 48-bit CMT devices included in r8a7796. - "renesas,r8a77965-cmt0" for the 32-bit CMT0 device included in r8a77965. - - "renesas,r8a77965-cmt1" for the 48-bit CMT1 device included in r8a77965. + - "renesas,r8a77965-cmt1" for the 48-bit CMT devices included in r8a77965. - "renesas,r8a77970-cmt0" for the 32-bit CMT0 device included in r8a77970. - - "renesas,r8a77970-cmt1" for the 48-bit CMT1 device included in r8a77970. + - "renesas,r8a77970-cmt1" for the 48-bit CMT devices included in r8a77970. - "renesas,r8a77980-cmt0" for the 32-bit CMT0 device included in r8a77980. - - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980. + - "renesas,r8a77980-cmt1" for the 48-bit CMT devices included in r8a77980. - "renesas,r8a77990-cmt0" for the 32-bit CMT0 device included in r8a77990. - - "renesas,r8a77990-cmt1" for the 48-bit CMT1 device included in r8a77990. + - "renesas,r8a77990-cmt1" for the 48-bit CMT devices included in r8a77990. - "renesas,r8a77995-cmt0" for the 32-bit CMT0 device included in r8a77995. - - "renesas,r8a77995-cmt1" for the 48-bit CMT1 device included in r8a77995. + - "renesas,r8a77995-cmt1" for the 48-bit CMT devices included in r8a77995. - "renesas,sh73a0-cmt0" for the 32-bit CMT0 device included in sh73a0. - "renesas,sh73a0-cmt1" for the 48-bit CMT1 device included in sh73a0. - "renesas,sh73a0-cmt2" for the 32-bit CMT2 device included in sh73a0.
@@ -69,7 +69,7 @@ Required Properties: listed above. - "renesas,rcar-gen3-cmt0" for 32-bit CMT0 devices included in R-Car Gen3 and RZ/G2. - - "renesas,rcar-gen3-cmt1" for 48-bit CMT1 devices included in R-Car Gen3 + - "renesas,rcar-gen3-cmt1" for 48-bit CMT devices included in R-Car Gen3 and RZ/G2. These are fallbacks for R-Car Gen3 and RZ/G2 entries listed above.
Signature · 1 line
2.17.1
PATCH 19/20 clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
Add SoC-specific matching for CMT1 on r8a7740 and sh73a0.
This allows us to move away from the old DT bindings such as
- "renesas,cmt-48-sh73a0"
- "renesas,cmt-48-r8a7740"
- "renesas,cmt-48"
in favour for the now commonly used format "renesas,<soc>-<device>"
--- drivers/clocksource/sh_cmt.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clocksource/sh_cmt.c +8 -0
@@ -924,6 +924,14 @@ static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { .compatible = "renesas,cmt-48-gen2", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2 ] }, + { + .compatible = "renesas,r8a7740-cmt1", + .data = &sh_cmt_info[SH_CMT_48BIT ] + }, + { + .compatible = "renesas,sh73a0-cmt1", + .data = &sh_cmt_info[SH_CMT_48BIT ] + }, { .compatible ="renesas,rcar-gen2-cmt0" , .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
Signature · 1 line
2.17.1
PATCH 20/20 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated
In reply to Daniel LezcanoFrom: Magnus Damm <[email protected]>
Update the CMT driver to mark "renesas,cmt-48" as deprecated.
Instead of documenting a theoretical hardware device based on current software support level, define DT bindings top-down based on available data sheet information and make use of part numbers in the DT compat string.
In case of the only in-tree users r8a7740 and sh73a0 the compat strings "renesas,r8a7740-cmt1" and "renesas,sh73a0-cmt1" may be used instead.
--- drivers/clocksource/sh_cmt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/clocksource/sh_cmt.c +5 -1
@@ -918,7 +918,11 @@ static const struct platform_device_id sh_cmt_id_table[] = {MODULE_DEVICE_TABLE (platform, sh_cmt_id_table);static const struct of_device_id sh_cmt_of_table[]__maybe_unused = { - { .compatible ="renesas,cmt-48" , .data = &sh_cmt_info[SH_CMT_48BIT ] }, + { +/* deprecated, preserved for backward compatibility */ + .compatible ="renesas,cmt-48" , + .data = &sh_cmt_info[SH_CMT_48BIT ] + }, {/* deprecated, preserved for backward compatibility */ .compatible ="renesas,cmt-48-gen2" ,
Signature · 1 line
2.17.1
Quoted 7 lines · Daniel Lezcano
The following changes since commit
08a3c192c93f4359a94bf47971e55b0324b72b8b:posix-timers: Prepare for
PREEMPT_RT(2019-08-01 20:51:25 +0200)are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.5
5.5 - that's for next year's first kernel so I'll put it into the fridge for now.
Quoted 11 lines · Thomas Gleixner
Quoted 7 lines · Daniel Lezcano
The following changes since commit
08a3c192c93f4359a94bf47971e55b0324b72b8b:posix-timers: Prepare for
PREEMPT_RT(2019-08-01 20:51:25 +0200)are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.5
5.5 - that's for next year's first kernel so I'll put it into the fridge for now.
Let me cook another tag :)
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
[GIT PULL] timers drivers v5.4
In reply to Thomas GleixnerHi Thomas,
The following changes since commit 3e2d94535adb2df15f3907e4b4c7cd8a5a4c2b5a:
clocksource/drivers/hyperv: Enable TSC page clocksource on 32bit
(2019-08-23 16:59:54 +0200)
are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.4
for you to fetch changes up to 19d608458f4f3bb3a1f89bd7e4814c3fd30dbec7:
clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated
(2019-08-27 00:31:39 +0200)
----------------------------------------------------------------
- Remove dev_err() when used with platform_get_irq (Stephen Boyd)
- Add DT binding and new compatible for Allwinner sun4i (Maxime Ripard)
- Register the Atmel tcb clocksource for delays (Alexandre Belloni)
- Add a clock divider for the Freescale imx platforms and new timer node in the DT (Anson Huang)
- Use DIV_ROUND_CLOSEST macro for the Renesas OSTM (Geert Uytterhoeven)
- Fix GENMASK and timer operation for the npcm timer (Avi Fishman)
- Fix timer-of showing an error message when EPROBE_DEFER is returned (Jon Hunter)
- Add new SoC DT binding and match for Renesas timers (Magnus Damm)
----------------------------------------------------------------
Alexandre Belloni (1):
clocksource/drivers/tcb_clksrc: Register delay timer
Anson Huang (3):
clocksource/drivers/imx-sysctr: Add internal clock divider handle
arm64: dts: imx8mm: Add system counter node
arm64: dts: imx8mq: Add system counter node
Avi Fishman (1):
clocksource/drivers/npcm: Fix GENMASK and timer operation
Geert Uytterhoeven (1):
clocksource/drivers/renesas-ostm: Use DIV_ROUND_CLOSEST() helper
Jon Hunter (2):
clocksource/drivers/timer-of: Do not warn on deferred probe clocksource/drivers: Do not warn on probe defer
Magnus Damm (7):
dt-bindings: timer: renesas, cmt: Add CMT0234 to sh73a0 and r8a7740
dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a7792
dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a77995
dt-bindings: timer: renesas, cmt: Update R-Car Gen3 CMT1 usage clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated
Maxime Ripard (4):
dt-bindings: timer: Convert Allwinner A10 Timer to a schema
dt-bindings: timer: Add missing compatibles
clocksource: sun4i: Add missing compatibles
dt-bindings: timer: Convert Allwinner A13 HSTimer to a schema
Stephen Boyd (1):
clocksource: Remove dev_err() usage after platform_get_irq()
.../bindings/timer/allwinner,sun4i-a10-timer.yaml | 102 +++++++++++++++++++++ .../bindings/timer/allwinner,sun4i-timer.txt | 19 ---- .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 26 ------ .../timer/allwinner,sun5i-a13-hstimer.yaml | 79 ++++++++++++++++ .../devicetree/bindings/timer/renesas,cmt.txt | 40 ++++---- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 ++ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 ++ drivers/clocksource/Kconfig | 2 +- drivers/clocksource/em_sti.c | 4 +- drivers/clocksource/renesas-ostm.c | 2 +- drivers/clocksource/sh_cmt.c | 19 +++- drivers/clocksource/sh_tmu.c | 5 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++ drivers/clocksource/timer-imx-sysctr.c | 5 + drivers/clocksource/timer-npcm7xx.c | 9 +- drivers/clocksource/timer-of.c | 6 +- drivers/clocksource/timer-probe.c | 4 +- drivers/clocksource/timer-sun4i.c | 4 + 18 files changed, 275 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt create mode 100644
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog