timer drivers for v5.7
Subsystems (10)
Hi Thomas,
here is the new material for v5.7.
It merges an immutable branch available for pwm on TI as asked by Tony Lindgren.
https://lkml.org/lkml/2020/3/16/411
The following changes since commit 5fb1c2a5bbf79ccca8d17cf97f66085be5808027:
posix-timers: Pass lockdep expression to RCU lists (2020-02-17
20:12:19 +0100)
are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.7
for you to fetch changes up to 4f41fe386a94639cd9a1831298d4f85db5662f1e:
clocksource/drivers/timer-probe: Avoid creating dead devices
(2020-03-17 13:10:07 +0100)
----------------------------------------------------------------
- Avoid creating dead devices by flagging the driver with OF_POPULATED in order to prevent the platform to create another device (Saravana
Kannan)
- Remove unused includes from imx family drivers (Anson Huang)
- timer-dm-ti rework to prepare for pwm and suspend support (Lokesh Vutla)
- Fix the rate for the global clock on the pit64b (Claudiu Beznea)
- Fix timer-cs5535 by requesting an irq with non-NULL dev_id (Afzal Mohammed)
- Replace setup_irq() by request_irq() (Afzal Mohammed)
- Add support for the TCU of X1000 (Zhou Yanjie)
- Drop the bogus omap_dm_timer_of_set_source() function (Suman Anna)
- Do not update the counter when updating the period in order to prevent a disruption when the pwm is used (Lokesh Vutla)
- Improve owl_timer_init() failure messages (Matheus Castello)
- Add driver for the Ingenic JZ47xx OST (Maarten ter Huurne)
- Pass the interrupt and the shutdown callbacks in the init function for ast2600 support (Joel Stanley)
- Add the ast2600 compatible string for the fttmr010 (Joel Stanley)
----------------------------------------------------------------
Anson Huang (2):
clocksource/drivers/imx-tpm: Remove unused includes clocksource/drivers/imx-sysctr: Remove unused includes
Claudiu Beznea (1):
clocksource/drivers/timer-microchip-pit64b: Fix rate for gck
Daniel Lezcano (1):
Merge branch 'timers/drivers/timer-ti-dm' into timers/drivers/next
Joel Stanley (3):
clocksource/drivers/fttmr010: Parametrise shutdown clocksource/drivers/fttmr010: Set interrupt and shutdown
dt-bindings: fttmr010: Add ast2600 compatible
Lokesh Vutla (6):
clocksource/drivers/timer-ti-dm: Do not update counter on updating
the period
clocksource/drivers/timer-ti-dm: Convert to SPDX identifier clocksource/drivers/timer-ti-dm: Implement cpu_pm notifier for
context save and restore
clocksource/drivers/timer-ti-dm: Do not update counter on updating
the period
clocksource/drivers/timer-ti-dm: Add support to get pwm current status clocksource/drivers/timer-ti-dm: Enable autoreload in set_pwm
Maarten ter Huurne (1):
clocksource: Add driver for the Ingenic JZ47xx OST
Matheus Castello (1):
clocksource/drivers/owl: Improve owl_timer_init fail messages
Saravana Kannan (1):
clocksource/drivers/timer-probe: Avoid creating dead devices
Suman Anna (1):
clocksource/drivers/timer-ti-dm: Drop bogusomap_dm_timer_of_set_source()
Tony Lindgren (1):
clocksource/drivers/timer-ti-dm: Prepare for using cpuidle
afzal mohammed (2):
clocksource: Replace setup_irq() by request_irq() clocksource/drivers/timer-cs5535: Request irq with non-NULL dev_id
周琰杰 (Zhou Yanjie) (2):
dt-bindings: timer: Add X1000 bindings. clocksource/drivers/ingenic: Add support for TCU of X1000
.../devicetree/bindings/timer/faraday,fttmr010.txt | 1 + .../devicetree/bindings/timer/ingenic,tcu.txt | 1 + drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/bcm2835_timer.c | 8 +- drivers/clocksource/bcm_kona_timer.c | 10 +- drivers/clocksource/dw_apb_timer.c | 11 +- drivers/clocksource/exynos_mct.c | 12 +- drivers/clocksource/ingenic-ost.c | 189 ++++++++++++++++++ drivers/clocksource/ingenic-timer.c | 3 +- drivers/clocksource/mxs_timer.c | 10 +- drivers/clocksource/nomadik-mtu.c | 11 +- drivers/clocksource/samsung_pwm_timer.c | 12 +- drivers/clocksource/timer-atlas7.c | 50 +++-- drivers/clocksource/timer-cs5535.c | 9 +- drivers/clocksource/timer-efm32.c | 10 +- drivers/clocksource/timer-fsl-ftm.c | 10 +- drivers/clocksource/timer-fttmr010.c | 68 +++++-- drivers/clocksource/timer-imx-gpt.c | 10 +- drivers/clocksource/timer-imx-sysctr.c | 2 - drivers/clocksource/timer-imx-tpm.c | 2 - drivers/clocksource/timer-integrator-ap.c | 11 +- drivers/clocksource/timer-meson6.c | 11 +- drivers/clocksource/timer-microchip-pit64b.c | 1 + drivers/clocksource/timer-orion.c | 9 +- drivers/clocksource/timer-owl.c | 15 +- drivers/clocksource/timer-prima2.c | 14 +- drivers/clocksource/timer-probe.c | 2 + drivers/clocksource/timer-pxa.c | 10 +- drivers/clocksource/timer-sp804.c | 11 +- drivers/clocksource/timer-ti-dm.c | 217 +++++++++++---------- drivers/clocksource/timer-u300.c | 9 +- drivers/clocksource/timer-vf-pit.c | 10 +- drivers/clocksource/timer-vt8500.c | 11 +- drivers/clocksource/timer-zevio.c | 13 +- drivers/pwm/pwm-omap-dmtimer.c | 8 +- include/clocksource/timer-ti-dm.h | 4 +- include/linux/dw_apb_timer.h | 1 - include/linux/platform_data/dmtimer-omap.h | 6 +- 39 files changed, 471 insertions(+), 330 deletions(-) create mode 100644 drivers/clocksource/ingenic-ost.c
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/21 clocksource/drivers/fttmr010: Parametrise shutdown
From: Joel Stanley <[email protected]>
In preparation for supporting the ast2600 which uses a different method to clear bits in the control register, use a callback for performing the shutdown sequence.
--- drivers/clocksource/timer-fttmr010.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/clocksource/timer-fttmr010.c +8 -11
@@ -97,6 +97,7 @@ struct fttmr010 {bool is_aspeed;u32 t1_enable_val;struct clock_event_device clkevt; +int (*timer_shutdown)(struct clock_event_device *evt);#ifdef CONFIG_ARM struct delay_timer delay_timer;#endif
@@ -140,9 +141,7 @@ static int fttmr010_timer_set_next_event(unsigned long cycles,u32 cr;/* Stop */ - cr =readl (fttmr010->base +TIMER_CR ); - cr &= ~fttmr010->t1_enable_val; -writel (cr, fttmr010->base +TIMER_CR ); + fttmr010->timer_shutdown (evt);if (fttmr010->is_aspeed) {/*
@@ -183,9 +182,7 @@ static int fttmr010_timer_set_oneshot(struct clock_event_device *evt)u32 cr;/* Stop */ - cr =readl (fttmr010->base +TIMER_CR ); - cr &= ~fttmr010->t1_enable_val; -writel (cr, fttmr010->base +TIMER_CR ); + fttmr010->timer_shutdown (evt);/* Setup counter start from 0 or ~0 */ writel (0 , fttmr010->base +TIMER1_COUNT );
@@ -211,9 +208,7 @@ static int fttmr010_timer_set_periodic(struct clock_event_device *evt)u32 cr;/* Stop */ - cr =readl (fttmr010->base +TIMER_CR ); - cr &= ~fttmr010->t1_enable_val; -writel (cr, fttmr010->base +TIMER_CR ); + fttmr010->timer_shutdown (evt);/* Setup timer to fire at 1/HZ intervals. */ if (fttmr010->is_aspeed) {
@@ -350,6 +345,8 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed) fttmr010->tick_rate); } + fttmr010->timer_shutdown = fttmr010_timer_shutdown; +/* * Setup clockevent timer (interrupt-driven) on timer 1. */
@@ -370,10 +367,10 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed) fttmr010->clkevt.features =CLOCK_EVT_FEAT_PERIODIC |CLOCK_EVT_FEAT_ONESHOT ; fttmr010->clkevt.set_next_event = fttmr010_timer_set_next_event; - fttmr010->clkevt.set_state_shutdown = fttmr010_timer_shutdown; + fttmr010->clkevt.set_state_shutdown = fttmr010->timer_shutdown; fttmr010->clkevt.set_state_periodic = fttmr010_timer_set_periodic; fttmr010->clkevt.set_state_oneshot = fttmr010_timer_set_oneshot; - fttmr010->clkevt.tick_resume = fttmr010_timer_shutdown; + fttmr010->clkevt.tick_resume = fttmr010->timer_shutdown; fttmr010->clkevt.cpumask =cpumask_of (0 ); fttmr010->clkevt.irq = irq; clockevents_config_and_register(&fttmr010->clkevt,
Signature · 1 line
2.17.1
PATCH 2/21 clocksource/drivers/fttmr010: Set interrupt and shutdown
From: Joel Stanley <[email protected]>
In preparation for supporting the ast2600, pass the shutdown and interrupt functions to the common init callback.
--- drivers/clocksource/timer-fttmr010.c | 51 +++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 5 deletions(-)
drivers/clocksource/timer-fttmr010.c +46 -5
@@ -37,6 +37,11 @@#define TIMER3_MATCH2 (0x2c)#define TIMER_CR (0x30) +/* +* Control register set to clear for ast2600 only. +*/ +#define AST2600_TIMER_CR_CLR (0x3c) +/* * Control register (TMC30) bit fields for fttmr010/gemini/moxart timers. */
@@ -163,6 +168,16 @@ static int fttmr010_timer_set_next_event(unsigned long cycles,return 0 ; } +static int ast2600_timer_shutdown (struct clock_event_device *evt) +{ +struct fttmr010 *fttmr010 =to_fttmr010 (evt); + +/* Stop */ +writel (fttmr010->t1_enable_val, fttmr010->base +AST2600_TIMER_CR_CLR ); + +return 0 ; +} +static int fttmr010_timer_shutdown (struct clock_event_device *evt) {struct fttmr010 *fttmr010 =to_fttmr010 (evt);
@@ -244,7 +259,21 @@ static irqreturn_t fttmr010_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __init fttmr010_common_init (struct device_node *np,bool is_aspeed) +static irqreturn_t ast2600_timer_interrupt (int irq,void *dev_id) +{ +struct clock_event_device *evt = dev_id; +struct fttmr010 *fttmr010 =to_fttmr010 (evt); + +writel (0x1 , fttmr010->base +TIMER_INTR_STATE ); + + evt->event_handler (evt); +return IRQ_HANDLED ; +} + +static int __init fttmr010_common_init (struct device_node *np, +bool is_aspeed, +int (*timer_shutdown)(struct clock_event_device *), +irq_handler_t irq_handler) {struct fttmr010 *fttmr010;int irq;
@@ -345,7 +374,7 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed) fttmr010->tick_rate); } - fttmr010->timer_shutdown = fttmr010_timer_shutdown; + fttmr010->timer_shutdown = timer_shutdown;/* * Setup clockevent timer (interrupt-driven) on timer 1.
@@ -354,7 +383,7 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)writel (0 , fttmr010->base +TIMER1_LOAD );writel (0 , fttmr010->base +TIMER1_MATCH1 );writel (0 , fttmr010->base +TIMER1_MATCH2 ); - ret =request_irq (irq, fttmr010_timer_interrupt,IRQF_TIMER , + ret =request_irq (irq, irq_handler,IRQF_TIMER ,"FTTMR010-TIMER1" , &fttmr010->clkevt);if (ret) {pr_err ("FTTMR010-TIMER1 no IRQ\n" );
@@ -401,14 +430,25 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)return ret; } +static __init int ast2600_timer_init (struct device_node *np) +{ +return fttmr010_common_init (np, true, + ast2600_timer_shutdown, + ast2600_timer_interrupt); +} +static __init int aspeed_timer_init (struct device_node *np) { -return fttmr010_common_init (np, true); +return fttmr010_common_init (np, true, + fttmr010_timer_shutdown, + fttmr010_timer_interrupt); }static __init int fttmr010_timer_init (struct device_node *np) { -return fttmr010_common_init (np, false); +return fttmr010_common_init (np, false, + fttmr010_timer_shutdown, + fttmr010_timer_interrupt); }TIMER_OF_DECLARE (fttmr010,"faraday,fttmr010" , fttmr010_timer_init);
@@ -416,3 +456,4 @@ TIMER_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init);TIMER_OF_DECLARE (moxart,"moxa,moxart-timer" , fttmr010_timer_init);TIMER_OF_DECLARE (ast2400,"aspeed,ast2400-timer" , aspeed_timer_init);TIMER_OF_DECLARE (ast2500,"aspeed,ast2500-timer" , aspeed_timer_init); +TIMER_OF_DECLARE (ast2600,"aspeed,ast2600-timer" , ast2600_timer_init);
Signature · 1 line
2.17.1
PATCH 3/21 dt-bindings: fttmr010: Add ast2600 compatible
In reply to Daniel LezcanoFrom: Joel Stanley <[email protected]>
The ast2600 contains a fttmr010 derivative.
--- Documentation/devicetree/bindings/timer/faraday,fttmr010.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/timer/faraday,fttmr010.txt +1 -0
@@ -11,6 +11,7 @@ Required properties: "moxa,moxart-timer", "faraday,fttmr010" "aspeed,ast2400-timer" "aspeed,ast2500-timer" + "aspeed,ast2600-timer" - reg : Should contain registers location and length - interrupts : Should contain the three timer interrupts usually with
Signature · 1 line
2.17.1
PATCH 4/21 clocksource: Add driver for the Ingenic JZ47xx OST
In reply to Daniel LezcanoFrom: Maarten ter Huurne <[email protected]>
OST is the OS Timer, a 64-bit timer/counter with buffered reading.
SoCs before the JZ4770 had (if any) a 32-bit OST; the JZ4770 and JZ4780 have a 64-bit OST.
This driver will register both a clocksource and a sched_clock to the system.
--- drivers/clocksource/Kconfig | 8 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/ingenic-ost.c | 189 ++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+) create mode 100644 drivers/clocksource/ingenic-ost.c
drivers/clocksource/Kconfig +8 -0
@@ -697,6 +697,14 @@ config INGENIC_TIMER help Support for the timer/counter unit of the Ingenic JZ SoCs. +config INGENIC_OST + bool "Clocksource for Ingenic OS Timer" + depends on MIPS || COMPILE_TEST + depends on COMMON_CLK + select MFD_SYSCON + help + Support for the Operating System Timer of the Ingenic JZ SoCs. + config MICROCHIP_PIT64B bool "Microchip PIT64B support" depends on OF || COMPILE_TEST
drivers/clocksource/Makefile +1 -0
@@ -80,6 +80,7 @@ obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o obj-$(CONFIG_H8300_TMR8) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o +obj-$(CONFIG_INGENIC_OST) += ingenic-ost.o obj-$(CONFIG_INGENIC_TIMER) += ingenic-timer.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o
drivers/clocksource/ingenic-ost.c new file +189 -0
189 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 5/21 clocksource/drivers/owl: Improve owl_timer_init fail messages
In reply to Daniel LezcanoFrom: Matheus Castello <[email protected]>
Check the return from clocksource_mmio_init, add messages in case of an error and in case of not having a defined clock property.
--- drivers/clocksource/timer-owl.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/clocksource/timer-owl.c +11 -4
@@ -135,8 +135,11 @@ static int __init owl_timer_init(struct device_node *node) } clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) -return PTR_ERR (clk); +if (IS_ERR (clk)) { + ret =PTR_ERR (clk); +pr_err ("Failed to get clock for clocksource (%d)\n" , ret); +return ret; + } rate =clk_get_rate (clk);
@@ -144,8 +147,12 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base, true);sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret =clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, + rate,200 ,32 , clocksource_mmio_readl_up); +if (ret) { +pr_err ("Failed to register clocksource (%d)\n" , ret); +return ret; + }owl_timer_reset (owl_clkevt_base);
Signature · 1 line
2.17.1
PATCH 6/21 clocksource/drivers/timer-ti-dm: Do not update counter on updating the period
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
Write to trigger register(OMAP_TIMER_TRIGGER_REG) will load the value in Load register(OMAP_TIMER_LOAD_REG) into Counter register (OMAP_TIMER_COUNTER_REG).
omap_dm_timer_set_load() writes into trigger register every time load register is updated. When timer is configured in pwm mode, this causes disruption in current pwm cycle, which is not expected especially when pwm is used as PPS signal for synchronized PTP clocks. So do not write into trigger register on updating the period.
--- drivers/clocksource/timer-ti-dm.c | 1 - 1 file changed, 1 deletion(-)
drivers/clocksource/timer-ti-dm.c +0 -1
@@ -577,7 +577,6 @@ static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l);omap_dm_timer_write_reg (timer,OMAP_TIMER_LOAD_REG , load); -omap_dm_timer_write_reg (timer,OMAP_TIMER_TRIGGER_REG ,0 );/* Save the context */ timer->context.tclr = l; timer->context.tldr = load;
Signature · 1 line
2.17.1
PATCH 7/21 clocksource/drivers/timer-ti-dm: Drop bogus omap_dm_timer_of_set_source()
In reply to Daniel LezcanoFrom: Suman Anna <[email protected]>
The function omap_dm_timer_of_set_source() was originally added in commit 31a7448f4fa8a ("ARM: OMAP: dmtimer: Add clock source from DT"), and is designed to set a clock source from DT using the clocks property of a timer node. This design choice is okay for clk provider nodes but otherwise is a bad design as typically the clocks property is used to specify the functional clocks for a device, and not its parents.
The timer nodes now all define a timer functional clock after the conversion to ti-sysc and the new clkctrl layout, and this results in an attempt to set the same functional clock as its parent when a consumer driver attempts to acquire any of these timers in the omap_dm_timer_prepare() function. This was masked and worked around in commit 983a5a43ec25 ("clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting"). Fix all of this by simply dropping the entire function.
Any DT configuration of clock sources should be achieved using assigned-clocks and assigned-clock-parents properties provided by the Common Clock Framework.
--- drivers/clocksource/timer-ti-dm.c | 33 +------------------------------ 1 file changed, 1 insertion(+), 32 deletions(-)
drivers/clocksource/timer-ti-dm.c +1 -32
@@ -138,35 +138,6 @@ static int omap_dm_timer_reset(struct omap_dm_timer *timer)return 0 ; } -static int omap_dm_timer_of_set_source (struct omap_dm_timer *timer) -{ -int ret; -struct clk *parent; - -/* -* FIXME: OMAP1 devices do not use the clock framework for dmtimers so -* do not call clk_get() for these devices. -*/ -if (!timer->fclk) -return -ENODEV ; - - parent =clk_get (&timer->pdev->dev,NULL ); -if (IS_ERR (parent)) -return -ENODEV ; - -/* Bail out if both clocks point to fck */ -if (clk_is_match (parent, timer->fclk)) -return 0 ; - - ret =clk_set_parent (timer->fclk, parent); -if (ret <0 ) -pr_err ("%s: failed to set parent\n" , __func__); - -clk_put (parent); - -return ret; -} -static int omap_dm_timer_set_source (struct omap_dm_timer *timer,int source) {int ret;
@@ -276,9 +247,7 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer)__omap_dm_timer_enable_posted (timer);omap_dm_timer_disable (timer); - rc =omap_dm_timer_of_set_source (timer); -if (rc == -ENODEV ) -return omap_dm_timer_set_source (timer,OMAP_TIMER_SRC_32_KHZ ); + rc =omap_dm_timer_set_source (timer,OMAP_TIMER_SRC_32_KHZ );return rc; }
Signature · 1 line
2.17.1
PATCH 8/21 dt-bindings: timer: Add X1000 bindings.
In reply to Daniel LezcanoFrom: 周琰杰 (Zhou Yanjie) <[email protected]>
Add the timer bindings for the X1000 Soc from Ingenic.
--- Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/timer/ingenic,tcu.txt +1 -0
@@ -10,6 +10,7 @@ Required properties: * ingenic,jz4740-tcu * ingenic,jz4725b-tcu * ingenic,jz4770-tcu + * ingenic,x1000-tcu followed by "simple-mfd". - reg: Should be the offset/length value corresponding to the TCU registers - clocks: List of phandle & clock specifiers for clocks external to the TCU.
Signature · 1 line
2.17.1
PATCH 9/21 clocksource/drivers/ingenic: Add support for TCU of X1000
In reply to Daniel LezcanoFrom: 周琰杰 (Zhou Yanjie) <[email protected]>
X1000 has a different TCU containing OST, since X1000, OST has been independent of TCU. This patch is prepare for later OST driver.
--- drivers/clocksource/ingenic-timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clocksource/ingenic-timer.c +2 -1
@@ -230,6 +230,7 @@ static const struct of_device_id ingenic_tcu_of_match[] = { { .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, }, { .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, }, { .compatible = "ingenic,jz4770-tcu", .data = &jz4740_soc_info, }, + { .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, }, { /* sentinel */ } };
@@ -302,7 +303,7 @@ static int __init ingenic_tcu_init(struct device_node *np)TIMER_OF_DECLARE (jz4740_tcu_intc,"ingenic,jz4740-tcu" , ingenic_tcu_init);TIMER_OF_DECLARE (jz4725b_tcu_intc,"ingenic,jz4725b-tcu" , ingenic_tcu_init);TIMER_OF_DECLARE (jz4770_tcu_intc,"ingenic,jz4770-tcu" , ingenic_tcu_init); - +TIMER_OF_DECLARE (x1000_tcu_intc,"ingenic,x1000-tcu" , ingenic_tcu_init);static int __init ingenic_tcu_probe (struct platform_device *pdev) {
Signature · 1 line
2.17.1
PATCH 10/21 clocksource: Replace setup_irq() by request_irq()
In reply to Daniel LezcanoFrom: afzal mohammed <[email protected]>
request_irq() is preferred over setup_irq(). The early boot setup_irq() invocations happen either via 'init_IRQ()' or 'time_init()', while memory allocators are ready by 'mm_init()'.
Per tglx[1], setup_irq() existed in olden days when allocators were not ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
Seldom remove_irq() usage has been observed coupled with setup_irq(), wherever that has been found, it too has been replaced by free_irq().
A build error that was reported by kbuild test robot <[email protected]> in the previous version of the patch also has been fixed.
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
--- drivers/clocksource/bcm2835_timer.c | 8 +--- drivers/clocksource/bcm_kona_timer.c | 10 ++--- drivers/clocksource/dw_apb_timer.c | 11 ++--- drivers/clocksource/exynos_mct.c | 12 ++---- drivers/clocksource/mxs_timer.c | 10 +---- drivers/clocksource/nomadik-mtu.c | 11 ++--- drivers/clocksource/samsung_pwm_timer.c | 12 ++---- drivers/clocksource/timer-atlas7.c | 50 +++++++++++------------ drivers/clocksource/timer-cs5535.c | 10 ++--- drivers/clocksource/timer-efm32.c | 10 +---- drivers/clocksource/timer-fsl-ftm.c | 10 +---- drivers/clocksource/timer-imx-gpt.c | 10 +---- drivers/clocksource/timer-integrator-ap.c | 11 ++--- drivers/clocksource/timer-meson6.c | 11 ++--- drivers/clocksource/timer-orion.c | 9 +--- drivers/clocksource/timer-prima2.c | 14 ++----- drivers/clocksource/timer-pxa.c | 10 +---- drivers/clocksource/timer-sp804.c | 11 ++--- drivers/clocksource/timer-u300.c | 9 +--- drivers/clocksource/timer-vf-pit.c | 10 +---- drivers/clocksource/timer-vt8500.c | 11 ++--- drivers/clocksource/timer-zevio.c | 13 +++--- include/linux/dw_apb_timer.h | 1 - 23 files changed, 83 insertions(+), 191 deletions(-)
drivers/clocksource/bcm2835_timer.c +2 -6
@@ -31,7 +31,6 @@ struct bcm2835_timer {void __iomem *compare;int match_mask;struct clock_event_device evt; -struct irqaction act; };static void __iomem *system_clock__read_mostly ;
@@ -113,12 +112,9 @@ static int __init bcm2835_timer_init(struct device_node *node) timer->evt.features =CLOCK_EVT_FEAT_ONESHOT ; timer->evt.set_next_event = bcm2835_time_set_next_event; timer->evt.cpumask =cpumask_of (0 ); - timer->act.name = node->name; - timer->act.flags =IRQF_TIMER |IRQF_SHARED ; - timer->act.dev_id = timer; - timer->act.handler = bcm2835_time_interrupt; - ret =setup_irq (irq, &timer->act); + ret =request_irq (irq, bcm2835_time_interrupt,IRQF_TIMER |IRQF_SHARED , + node->name, timer);if (ret) {pr_err ("Can't set up timer IRQ\n" ); goto err_timer_free;
drivers/clocksource/bcm_kona_timer.c +3 -7
@@ -160,12 +160,6 @@ static irqreturn_t kona_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction kona_timer_irq = { - .name ="Kona Timer Tick" , - .flags =IRQF_TIMER , - .handler = kona_timer_interrupt, -}; -static int __init kona_timer_init (struct device_node *node) {u32 freq;
@@ -192,7 +186,9 @@ static int __init kona_timer_init(struct device_node *node)kona_timer_disable_and_clear (timers.tmr_regs);kona_timer_clockevents_init (); -setup_irq (timers.tmr_irq, &kona_timer_irq); +if (request_irq (timers.tmr_irq, kona_timer_interrupt,IRQF_TIMER , +"Kona Timer Tick" ,NULL )) +pr_err ("%s: request_irq() failed\n" ,"Kona Timer Tick" );kona_timer_set_next_event ((arch_timer_rate /HZ ),NULL );return 0 ;
drivers/clocksource/dw_apb_timer.c +3 -8
@@ -270,15 +270,10 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, dw_ced->ced.rating = rating; dw_ced->ced.name = name; - dw_ced->irqaction.name = dw_ced->ced.name; - dw_ced->irqaction.handler = dw_apb_clockevent_irq; - dw_ced->irqaction.dev_id = &dw_ced->ced; - dw_ced->irqaction.irq = irq; - dw_ced->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL | -IRQF_NOBALANCING ; - dw_ced->eoi = apbt_eoi; - err =setup_irq (irq, &dw_ced->irqaction); + err =request_irq (irq, dw_apb_clockevent_irq, +IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING , + dw_ced->ced.name, &dw_ced->ced);if (err) {pr_err ("failed to request timer irq\n" );kfree (dw_ced);
drivers/clocksource/exynos_mct.c +4 -8
@@ -329,19 +329,15 @@ static irqreturn_t exynos4_mct_comp_isr(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction mct_comp_event_irq = { - .name ="mct_comp_irq" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = exynos4_mct_comp_isr, - .dev_id = &mct_comp_device, -}; -static int exynos4_clockevent_init (void ) { mct_comp_device.cpumask =cpumask_of (0 );clockevents_config_and_register (&mct_comp_device, clk_rate,0xf ,0xffffffff ); -setup_irq (mct_irqs[MCT_G0_IRQ ], &mct_comp_event_irq); +if (request_irq (mct_irqs[MCT_G0_IRQ ], exynos4_mct_comp_isr, +IRQF_TIMER |IRQF_IRQPOLL ,"mct_comp_irq" , + &mct_comp_device)) +pr_err ("%s: request_irq() failed\n" ,"mct_comp_irq" );return 0 ; }
drivers/clocksource/mxs_timer.c +2 -8
@@ -117,13 +117,6 @@ static irqreturn_t mxs_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction mxs_timer_irq = { - .name ="MXS Timer Tick" , - .dev_id = &mxs_clockevent_device, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = mxs_timer_interrupt, -}; -static void mxs_irq_clear (char *state) {/* Disable interrupt in timer module */
@@ -277,6 +270,7 @@ static int __init mxs_timer_init(struct device_node *np)if (irq <=0 )return -EINVAL ; -return setup_irq (irq, &mxs_timer_irq); +return request_irq (irq, mxs_timer_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"MXS Timer Tick" , &mxs_clockevent_device); }TIMER_OF_DECLARE (mxs,"fsl,timrot" , mxs_timer_init);
drivers/clocksource/nomadik-mtu.c +3 -8
@@ -181,13 +181,6 @@ static irqreturn_t nmdk_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction nmdk_timer_irq = { - .name ="Nomadik Timer Tick" , - .flags =IRQF_TIMER , - .handler = nmdk_timer_interrupt, - .dev_id = &nmdk_clkevt, -}; -static int __init nmdk_timer_init (void __iomem *base,int irq,struct clk *pclk,struct clk *clk) {
@@ -232,7 +225,9 @@ static int __init nmdk_timer_init(void __iomem *base, int irq,sched_clock_register (nomadik_read_sched_clock,32 , rate);/* Timer 1 is used for events, register irq and clockevents */ -setup_irq (irq, &nmdk_timer_irq); +if (request_irq (irq, nmdk_timer_interrupt,IRQF_TIMER , +"Nomadik Timer Tick" , &nmdk_clkevt)) +pr_err ("%s: request_irq() failed\n" ,"Nomadik Timer Tick" ); nmdk_clkevt.cpumask =cpumask_of (0 ); nmdk_clkevt.irq = irq;clockevents_config_and_register (&nmdk_clkevt, rate,2 ,0xffffffffU );
drivers/clocksource/samsung_pwm_timer.c +4 -8
@@ -256,13 +256,6 @@ static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction samsung_clock_event_irq = { - .name ="samsung_time_irq" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = samsung_clock_event_isr, - .dev_id = &time_event_device, -}; -static void __init samsung_clockevent_init (void ) {unsigned long pclk;
@@ -282,7 +275,10 @@ static void __init samsung_clockevent_init(void) clock_rate, 1, pwm.tcnt_max); irq_number = pwm.irq[pwm.event_id]; -setup_irq (irq_number, &samsung_clock_event_irq); +if (request_irq (irq_number, samsung_clock_event_isr, +IRQF_TIMER |IRQF_IRQPOLL ,"samsung_time_irq" , + &time_event_device)) +pr_err ("%s: request_irq() failed\n" ,"samsung_time_irq" );if (pwm.variant.has_tint_cstat) {u32 mask = (1 << pwm.event_id);
drivers/clocksource/timer-atlas7.c +23 -27
87 lines not on this page · raw message
drivers/clocksource/timer-cs5535.c +3 -7
@@ -131,12 +131,6 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction mfgptirq = { - .handler = mfgpt_tick, - .flags =IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , - .name =DRV_NAME , -}; -static int __init cs5535_mfgpt_init (void ) {struct cs5535_mfgpt_timer *timer;
@@ -158,7 +152,9 @@ static int __init cs5535_mfgpt_init(void) }/* And register it with the kernel */ - ret =setup_irq (timer_irq, &mfgptirq); + ret =request_irq (timer_irq, mfgpt_tick, +IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , +DRV_NAME ,NULL );if (ret) { printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n"); goto err_irq;
drivers/clocksource/timer-efm32.c +2 -8
@@ -119,13 +119,6 @@ static struct efm32_clock_event_ddata clock_event_ddata = { }, }; -static struct irqaction efm32_clock_event_irq = { - .name ="efm32 clockevent" , - .flags =IRQF_TIMER , - .handler = efm32_clock_event_handler, - .dev_id = &clock_event_ddata, -}; -static int __init efm32_clocksource_init (struct device_node *np) {struct clk *clk;
@@ -230,7 +223,8 @@ static int __init efm32_clockevent_init(struct device_node *np)DIV_ROUND_CLOSEST (rate,1024 ), 0xf, 0xffff); - ret =setup_irq (irq, &efm32_clock_event_irq); + ret =request_irq (irq, efm32_clock_event_handler,IRQF_TIMER , +"efm32 clockevent" , &clock_event_ddata);if (ret) {pr_err ("Failed setup irq\n" ); goto err_setup_irq;
drivers/clocksource/timer-fsl-ftm.c +2 -8
@@ -176,13 +176,6 @@ static struct clock_event_device ftm_clockevent = { .rating = 300, }; -static struct irqaction ftm_timer_irq = { - .name ="Freescale ftm timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = ftm_evt_interrupt, - .dev_id = &ftm_clockevent, -}; -static int __init ftm_clockevent_init (unsigned long freq,int irq) {int err;
@@ -192,7 +185,8 @@ static int __init ftm_clockevent_init(unsigned long freq, int irq)ftm_reset_counter (priv->clkevt_base); - err =setup_irq (irq, &ftm_timer_irq); + err =request_irq (irq, ftm_evt_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"Freescale ftm timer" , &ftm_clockevent);if (err) {pr_err ("ftm: setup irq failed: %d\n" , err);return err;
drivers/clocksource/timer-imx-gpt.c +2 -8
@@ -67,7 +67,6 @@ struct imx_timer {struct clk *clk_ipg;const struct imx_gpt_data *gpt;struct clock_event_device ced; -struct irqaction act; };struct imx_gpt_data {
@@ -273,7 +272,6 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id)static int __init mxc_clockevent_init (struct imx_timer *imxtm) {struct clock_event_device *ced = &imxtm->ced; -struct irqaction *act = &imxtm->act; ced->name ="mxc_timer1" ; ced->features =CLOCK_EVT_FEAT_ONESHOT |CLOCK_EVT_FEAT_DYNIRQ ;
@@ -287,12 +285,8 @@ static int __init mxc_clockevent_init(struct imx_timer *imxtm)clockevents_config_and_register (ced,clk_get_rate (imxtm->clk_per),0xff ,0xfffffffe ); - act->name ="i.MX Timer Tick" ; - act->flags =IRQF_TIMER |IRQF_IRQPOLL ; - act->handler = mxc_timer_interrupt; - act->dev_id = ced; - -return setup_irq (imxtm->irq, act); +return request_irq (imxtm->irq, mxc_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"i.MX Timer Tick" , ced); }static void imx1_gpt_setup_tctl (struct imx_timer *imxtm)
drivers/clocksource/timer-integrator-ap.c +3 -8
@@ -123,13 +123,6 @@ static struct clock_event_device integrator_clockevent = { .rating = 300, }; -static struct irqaction integrator_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = integrator_timer_interrupt, - .dev_id = &integrator_clockevent, -}; -static int integrator_clockevent_init (unsigned long inrate,void __iomem *base,int irq) {
@@ -149,7 +142,9 @@ static int integrator_clockevent_init(unsigned long inrate, timer_reload = rate /HZ ;writel (ctrl, clkevt_base +TIMER_CTRL ); - ret =setup_irq (irq, &integrator_timer_irq); + ret =request_irq (irq, integrator_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"timer" , + &integrator_clockevent);if (ret)return ret;
drivers/clocksource/timer-meson6.c +3 -8
@@ -150,13 +150,6 @@ static irqreturn_t meson6_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction meson6_timer_irq = { - .name ="meson6_timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = meson6_timer_interrupt, - .dev_id = &meson6_clockevent, -}; -static int __init meson6_timer_init (struct device_node *node) {u32 val;
@@ -194,7 +187,9 @@ static int __init meson6_timer_init(struct device_node *node)/* Stop the timer A */ meson6_clkevt_time_stop (); - ret =setup_irq (irq, &meson6_timer_irq); + ret =request_irq (irq, meson6_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"meson6_timer" , + &meson6_clockevent);if (ret) {pr_warn ("failed to setup irq %d\n" , irq);return ret;
drivers/clocksource/timer-orion.c +2 -7
@@ -114,12 +114,6 @@ static irqreturn_t orion_clkevt_irq_handler(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction orion_clkevt_irq = { - .name ="orion_event" , - .flags =IRQF_TIMER , - .handler = orion_clkevt_irq_handler, -}; -static int __init orion_timer_init (struct device_node *np) {unsigned long rate;
@@ -172,7 +166,8 @@ static int __init orion_timer_init(struct device_node *np)sched_clock_register (orion_read_sched_clock,32 , rate);/* setup timer1 as clockevent timer */ - ret =setup_irq (irq, &orion_clkevt_irq); + ret =request_irq (irq, orion_clkevt_irq_handler,IRQF_TIMER , +"orion_event" ,NULL );if (ret) {pr_err ("%pOFn: unable to setup irq\n" , np);return ret;
drivers/clocksource/timer-prima2.c +4 -10
@@ -165,14 +165,6 @@ static struct clocksource sirfsoc_clocksource = { .resume = sirfsoc_clocksource_resume, }; -static struct irqaction sirfsoc_timer_irq = { - .name ="sirfsoc_timer0" , - .flags =IRQF_TIMER , - .irq =0 , - .handler = sirfsoc_timer_interrupt, - .dev_id = &sirfsoc_clockevent, -}; -/* Overwrite weak default sched_clock with more precise one */ static u64 notrace sirfsoc_read_sched_clock(void) {
@@ -190,6 +182,7 @@ static void __init sirfsoc_clockevent_init(void)static int __init sirfsoc_prima2_timer_init (struct device_node *np) {unsigned long rate; +unsigned int irq;struct clk *clk;int ret;
@@ -218,7 +211,7 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np)return -ENXIO ; } - sirfsoc_timer_irq.irq =irq_of_parse_and_map (np,0 ); + irq =irq_of_parse_and_map (np,0 );writel_relaxed (rate /PRIMA2_CLOCK_FREQ /2 -1 , sirfsoc_timer_base +SIRFSOC_TIMER_DIV );
@@ -234,7 +227,8 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np)sched_clock_register (sirfsoc_read_sched_clock,64 ,PRIMA2_CLOCK_FREQ ); - ret =setup_irq (sirfsoc_timer_irq.irq, &sirfsoc_timer_irq); + ret =request_irq (irq, sirfsoc_timer_interrupt,IRQF_TIMER , +"sirfsoc_timer0" , &sirfsoc_clockevent);if (ret) {pr_err ("Failed to setup irq\n" );return ret;
drivers/clocksource/timer-pxa.c +2 -8
@@ -143,13 +143,6 @@ static struct clock_event_device ckevt_pxa_osmr0 = { .resume = pxa_timer_resume, }; -static struct irqaction pxa_ost0_irq = { - .name ="ost0" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = pxa_ost0_interrupt, - .dev_id = &ckevt_pxa_osmr0, -}; -static int __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {int ret;
@@ -161,7 +154,8 @@ static int __init pxa_timer_common_init(int irq, unsigned long clock_tick_rate) ckevt_pxa_osmr0.cpumask =cpumask_of (0 ); - ret =setup_irq (irq, &pxa_ost0_irq); + ret =request_irq (irq, pxa_ost0_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"ost0" , &ckevt_pxa_osmr0);if (ret) {pr_err ("Failed to setup irq\n" );return ret;
drivers/clocksource/timer-sp804.c +3 -8
@@ -168,13 +168,6 @@ static struct clock_event_device sp804_clockevent = { .rating = 300, }; -static struct irqaction sp804_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = sp804_timer_interrupt, - .dev_id = &sp804_clockevent, -}; -int __init __sp804_clockevents_init (void __iomem *base,unsigned int irq,struct clk *clk,const char *name) {struct clock_event_device *evt = &sp804_clockevent;
@@ -200,7 +193,9 @@ int __init __sp804_clockevents_init(void __iomem *base, unsigned int irq, structwritel (0 , base +TIMER_CTRL ); -setup_irq (irq, &sp804_timer_irq); +if (request_irq (irq, sp804_timer_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"timer" , &sp804_clockevent)) +pr_err ("%s: request_irq() failed\n" ,"timer" );clockevents_config_and_register (evt, rate,0xf ,0xffffffff );return 0 ;
drivers/clocksource/timer-u300.c +2 -7
@@ -330,12 +330,6 @@ static irqreturn_t u300_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction u300_timer_irq = { - .name ="U300 Timer Tick" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = u300_timer_interrupt, -}; -/* * Override the global weak sched_clock symbol with this * local implementation which uses the clocksource to get some
@@ -420,7 +414,8 @@ static int __init u300_timer_init_of(struct device_node *np) u300_timer_base + U300_TIMER_APP_RGPT1);/* Set up the IRQ handler */ - ret =setup_irq (irq, &u300_timer_irq); + ret =request_irq (irq, u300_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"U300 Timer Tick" ,NULL );if (ret)return ret;
drivers/clocksource/timer-vf-pit.c +2 -8
@@ -123,19 +123,13 @@ static struct clock_event_device clockevent_pit = { .rating = 300, }; -static struct irqaction pit_timer_irq = { - .name ="VF pit timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = pit_timer_interrupt, - .dev_id = &clockevent_pit, -}; -static int __init pit_clockevent_init (unsigned long rate,int irq) {__raw_writel (0 , clkevt_base +PITTCTRL );__raw_writel (PITTFLG_TIF , clkevt_base +PITTFLG ); -BUG_ON (setup_irq (irq, &pit_timer_irq)); +BUG_ON (request_irq (irq, pit_timer_interrupt,IRQF_TIMER |IRQF_IRQPOLL , + "VF pit timer", &clockevent_pit); clockevent_pit.cpumask =cpumask_of (0 ); clockevent_pit.irq = irq;
drivers/clocksource/timer-vt8500.c +3 -8
@@ -101,13 +101,6 @@ static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction irq = { - .name ="vt8500_timer" , - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .handler = vt8500_timer_interrupt, - .dev_id = &clockevent, -}; -static int __init vt8500_timer_init (struct device_node *np) {int timer_irq, ret;
@@ -139,7 +132,9 @@ static int __init vt8500_timer_init(struct device_node *np) clockevent.cpumask =cpumask_of (0 ); - ret =setup_irq (timer_irq, &irq); + ret =request_irq (timer_irq, vt8500_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"vt8500_timer" , + &clockevent);if (ret) {pr_err ("%s: setup_irq failed for %s\n" , __func__, clockevent.name);
drivers/clocksource/timer-zevio.c +6 -7
@@ -53,7 +53,6 @@ struct zevio_timer {struct clk *clk;struct clock_event_device clkevt; -struct irqaction clkevt_irq;char clocksource_name[64 ];char clockevent_name[64 ];
@@ -172,12 +171,12 @@ static int __init zevio_timer_add(struct device_node *node)/* Interrupt to occur when timer value matches 0 */ writel (0 , timer->base +IO_MATCH (TIMER_MATCH )); - timer->clkevt_irq.name = timer->clockevent_name; - timer->clkevt_irq.handler = zevio_timer_interrupt; - timer->clkevt_irq.dev_id = timer; - timer->clkevt_irq.flags =IRQF_TIMER |IRQF_IRQPOLL ; - -setup_irq (irqnr, &timer->clkevt_irq); +if (request_irq (irqnr, zevio_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL , + timer->clockevent_name, timer)) { +pr_err ("%s: request_irq() failed\n" , + timer->clockevent_name); + }clockevents_config_and_register (&timer->clkevt,clk_get_rate (timer->clk),0x0001 ,0xffff );
include/linux/dw_apb_timer.h +0 -1
@@ -25,7 +25,6 @@ struct dw_apb_timer {struct dw_apb_clock_event_device {struct clock_event_device ced;struct dw_apb_timer timer; -struct irqaction irqaction;void (*eoi)(struct dw_apb_timer *); };
Signature · 1 line
2.17.1
Re: [PATCH 10/21] clocksource: Replace setup_irq() by request_irq()
Quoted 14 lines · Daniel Lezcano
From: afzal mohammed <[email protected]>
request_irq()is preferred oversetup_irq(). The early bootsetup_irq()invocations happen either via 'init_IRQ()' or 'time_init()', while memory allocators are ready by 'mm_init()'.Per tglx[1],
setup_irq()existed in olden days when allocators were not ready by the time early interrupts were initialized.Hence replace
setup_irq()byrequest_irq().Seldom
remove_irq()usage has been observed coupled withsetup_irq(), wherever that has been found, it too has been replaced byfree_irq().
Quoted 8 lines
A build error that was reported by kbuild test robot <[email protected]> in the previous version of the patch also has been fixed.
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
It is definitely the right thing to do, I cannot test it right now but if desired I can test it on my targets later in the following weeks.
Yours,
Linus Walleij
PATCH 11/21 clocksource/drivers/timer-cs5535: Request irq with non-NULL dev_id
In reply to Daniel LezcanoFrom: afzal mohammed <[email protected]>
Recently all usages of setup_irq() was replaced by request_irq(). request_irq() does a few sanity checks that were not done in setup_irq(), if they fail irq registration will fail. One of the check is to ensure that non-NULL dev_id is passed in the case of shared irq.
Fix it by passing non-NULL dev_id while registering the shared irq.
--- drivers/clocksource/timer-cs5535.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/timer-cs5535.c +2 -3
@@ -133,6 +133,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)static int __init cs5535_mfgpt_init (void ) { +unsigned long flags =IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED ;struct cs5535_mfgpt_timer *timer;int ret;uint16_t val;
@@ -152,9 +153,7 @@ static int __init cs5535_mfgpt_init(void) }/* And register it with the kernel */ - ret =request_irq (timer_irq, mfgpt_tick, -IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , -DRV_NAME ,NULL ); + ret =request_irq (timer_irq, mfgpt_tick, flags,DRV_NAME , timer);if (ret) { printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n"); goto err_irq;
Signature · 1 line
2.17.1
PATCH 12/21 clocksource/drivers/timer-microchip-pit64b: Fix rate for gck
In reply to Daniel LezcanoFrom: Claudiu Beznea <[email protected]>
Generic clock rate needs to be set in case it was selected as timer clock source in mchp_pit64b_init_mode(). Otherwise it will be enabled with wrong rate.
--- drivers/clocksource/timer-microchip-pit64b.c | 1 + 1 file changed, 1 insertion(+)
drivers/clocksource/timer-microchip-pit64b.c +1 -0
@@ -264,6 +264,7 @@ static int __init mchp_pit64b_init_mode(struct mchp_pit64b_timer *timer,if (!best_diff) { timer->mode |=MCHP_PIT64B_MR_SGCLK ; +clk_set_rate (timer->gclk, gclk_round); goto done; }
Signature · 1 line
2.17.1
PATCH 13/21 clocksource/drivers/timer-ti-dm: Convert to SPDX identifier
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
Use SPDX-License-Identifier instead of a verbose license text.
--- drivers/clocksource/timer-ti-dm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/clocksource/timer-ti-dm.c +1 -18
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * linux/arch/arm/plat-omap/dmtimer.c *
@@ -15,24 +16,6 @@* * Copyright (C) 2009 Texas Instruments * Added OMAP4 support - Santosh Shilimkar <[email protected]> -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2 of the License, or (at your -* option) any later version. -* -* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/clk.h>
Signature · 1 line
2.17.1
PATCH 14/21 clocksource/drivers/timer-ti-dm: Prepare for using cpuidle
In reply to Daniel LezcanoFrom: Tony Lindgren <[email protected]>
Let's add runtime_suspend and resume functions and atomic enabled flag. This way we can use these when converting to use cpuidle for saving and restoring device context.
And we need to maintain the driver state in the driver as documented in "9. Autosuspend, or automatically-delayed suspends" in the Documentation/power/runtime_pm.rst document related to using driver private lock and races with runtime_suspend().
--- drivers/clocksource/timer-ti-dm.c | 36 ++++++++++++++++++++++++++----- include/clocksource/timer-ti-dm.h | 1 + 2 files changed, 32 insertions(+), 5 deletions(-)
drivers/clocksource/timer-ti-dm.c +31 -5
@@ -491,7 +491,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)int omap_dm_timer_trigger (struct omap_dm_timer *timer) { -if (unlikely (!timer ||pm_runtime_suspended (&timer->pdev->dev))) { +if (unlikely (!timer || !atomic_read (&timer->enabled))) {pr_err ("%s: timer not available or enabled.\n" , __func__);return -EINVAL ; }
@@ -690,7 +690,7 @@ static unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer) {unsigned int l; -if (unlikely (!timer ||pm_runtime_suspended (&timer->pdev->dev))) { +if (unlikely (!timer || !atomic_read (&timer->enabled))) {pr_err ("%s: timer not available or enabled.\n" , __func__);return 0 ; }
@@ -702,7 +702,7 @@ static unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)static int omap_dm_timer_write_status (struct omap_dm_timer *timer,unsigned int value) { -if (unlikely (!timer ||pm_runtime_suspended (&timer->pdev->dev))) +if (unlikely (!timer || !atomic_read (&timer->enabled)))return -EINVAL ;__omap_dm_timer_write_status (timer, value);
@@ -712,7 +712,7 @@ static int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned intstatic unsigned int omap_dm_timer_read_counter (struct omap_dm_timer *timer) { -if (unlikely (!timer ||pm_runtime_suspended (&timer->pdev->dev))) { +if (unlikely (!timer || !atomic_read (&timer->enabled))) {pr_err ("%s: timer not iavailable or enabled.\n" , __func__);return 0 ; }
@@ -722,7 +722,7 @@ static unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)static int omap_dm_timer_write_counter (struct omap_dm_timer *timer,unsigned int value) { -if (unlikely (!timer ||pm_runtime_suspended (&timer->pdev->dev))) { +if (unlikely (!timer || !atomic_read (&timer->enabled))) {pr_err ("%s: timer not available or enabled.\n" , __func__);return -EINVAL ; }
@@ -750,6 +750,29 @@ int omap_dm_timers_active(void)return 0 ; } +static int __maybe_unused omap_dm_timer_runtime_suspend (struct device *dev) +{ +struct omap_dm_timer *timer =dev_get_drvdata (dev); + +atomic_set (&timer->enabled,0 ); + +return 0 ; +} + +static int __maybe_unused omap_dm_timer_runtime_resume (struct device *dev) +{ +struct omap_dm_timer *timer =dev_get_drvdata (dev); + +atomic_set (&timer->enabled,1 ); + +return 0 ; +} + +static const struct dev_pm_ops omap_dm_timer_pm_ops = { +SET_RUNTIME_PM_OPS (omap_dm_timer_runtime_suspend, + omap_dm_timer_runtime_resume,NULL ) +}; +static const struct of_device_id omap_timer_match[];/**
@@ -791,6 +814,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev)if (IS_ERR (timer->io_base))return PTR_ERR (timer->io_base); +platform_set_drvdata (pdev, timer); +if (dev->of_node) {if (of_find_property (dev->of_node,"ti,timer-alwon" ,NULL )) timer->capability |=OMAP_TIMER_ALWON ;
@@ -936,6 +961,7 @@ static struct platform_driver omap_dm_timer_driver = { .driver = { .name = "omap_timer", .of_match_table = of_match_ptr(omap_timer_match), + .pm = &omap_dm_timer_pm_ops, }, };
include/clocksource/timer-ti-dm.h +1 -0
@@ -105,6 +105,7 @@ struct omap_dm_timer {void __iomem *pend;/* write pending */ void __iomem *func_base;/* function register base */ +atomic_t enabled;unsigned long rate; unsigned reserved:1; unsigned posted:1;
Signature · 1 line
2.17.1
PATCH 15/21 clocksource/drivers/timer-ti-dm: Implement cpu_pm notifier for context save and restore
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
omap_dm_timer_enable() restores the entire context(including counter) based on 2 conditions:
- If get_context_loss_count is populated and context is lost.
- If get_context_loss_count is not populated update unconditionally.
Case2 has a side effect of updating the counter register even though context is not lost. When timer is configured in pwm mode, this is causing undesired behaviour in the pwm period.
Instead of using get_context_loss_count call back, implement cpu_pm notifier with context save and restore support. And delete the get_context_loss_count callback all together.
--- drivers/clocksource/timer-ti-dm.c | 97 ++++++++++++++++++------------- include/clocksource/timer-ti-dm.h | 3 +- 2 files changed, 58 insertions(+), 42 deletions(-)
drivers/clocksource/timer-ti-dm.c +57 -40
@@ -20,6 +20,7 @@#include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/cpu_pm.h> #include <linux/module.h> #include <linux/io.h> #include <linux/device.h>
@@ -92,6 +93,47 @@ static void omap_timer_restore_context(struct omap_dm_timer *timer) timer->context.tclr); } +static void omap_timer_save_context (struct omap_dm_timer *timer) +{ + timer->context.tclr = +omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG ); + timer->context.twer = +omap_dm_timer_read_reg (timer,OMAP_TIMER_WAKEUP_EN_REG ); + timer->context.tldr = +omap_dm_timer_read_reg (timer,OMAP_TIMER_LOAD_REG ); + timer->context.tmar = +omap_dm_timer_read_reg (timer,OMAP_TIMER_MATCH_REG ); + timer->context.tier =readl_relaxed (timer->irq_ena); + timer->context.tsicr = +omap_dm_timer_read_reg (timer,OMAP_TIMER_IF_CTRL_REG ); +} + +static int omap_timer_context_notifier (struct notifier_block *nb, +unsigned long cmd,void *v) +{ +struct omap_dm_timer *timer; + + timer = container_of(nb, struct omap_dm_timer, nb); + +switch (cmd) { +case CPU_CLUSTER_PM_ENTER : +if ((timer->capability &OMAP_TIMER_ALWON ) || + !atomic_read (&timer->enabled)) +break ; +omap_timer_save_context (timer); +break ; +case CPU_CLUSTER_PM_ENTER_FAILED : +case CPU_CLUSTER_PM_EXIT : +if ((timer->capability &OMAP_TIMER_ALWON ) || + !atomic_read (&timer->enabled)) +break ; +omap_timer_restore_context (timer); +break ; + } + +return NOTIFY_OK ; +} +static int omap_dm_timer_reset (struct omap_dm_timer *timer) {u32 l, timeout =100000 ;
@@ -208,21 +250,7 @@ static int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)static void omap_dm_timer_enable (struct omap_dm_timer *timer) { -int c; -pm_runtime_get_sync (&timer->pdev->dev); - -if (!(timer->capability &OMAP_TIMER_ALWON )) { -if (timer->get_context_loss_count) { - c = timer->get_context_loss_count (&timer->pdev->dev); -if (c != timer->ctx_loss_count) { -omap_timer_restore_context (timer); - timer->ctx_loss_count = c; - } - }else { -omap_timer_restore_context (timer); - } - } }static void omap_dm_timer_disable (struct omap_dm_timer *timer)
@@ -515,8 +543,6 @@ static int omap_dm_timer_start(struct omap_dm_timer *timer)omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l); } -/* Save the context */ - timer->context.tclr = l;return 0 ; }
@@ -532,13 +558,6 @@ static int omap_dm_timer_stop(struct omap_dm_timer *timer)__omap_dm_timer_stop (timer, timer->posted, rate); -/* -* Since the register values are computed and written within -* __omap_dm_timer_stop, we need to use read to retrieve the -* context. -*/ - timer->context.tclr = -omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG );omap_dm_timer_disable (timer);return 0 ; }
@@ -561,9 +580,6 @@ static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,omap_dm_timer_write_reg (timer,OMAP_TIMER_LOAD_REG , load);omap_dm_timer_write_reg (timer,OMAP_TIMER_TRIGGER_REG ,0 ); -/* Save the context */ - timer->context.tclr = l; - timer->context.tldr = load;omap_dm_timer_disable (timer);return 0 ; }
@@ -585,9 +601,6 @@ static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,omap_dm_timer_write_reg (timer,OMAP_TIMER_MATCH_REG , match);omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l); -/* Save the context */ - timer->context.tclr = l; - timer->context.tmar = match;omap_dm_timer_disable (timer);return 0 ; }
@@ -611,8 +624,6 @@ static int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, l |= trigger <<10 ;omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l); -/* Save the context */ - timer->context.tclr = l;omap_dm_timer_disable (timer);return 0 ; }
@@ -634,8 +645,6 @@ static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, }omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l); -/* Save the context */ - timer->context.tclr = l;omap_dm_timer_disable (timer);return 0 ; }
@@ -649,9 +658,6 @@ static int omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,omap_dm_timer_enable (timer);__omap_dm_timer_int_enable (timer, value); -/* Save the context */ - timer->context.tier = value; - timer->context.twer = value;omap_dm_timer_disable (timer);return 0 ; }
@@ -679,9 +685,6 @@ static int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask) l =omap_dm_timer_read_reg (timer,OMAP_TIMER_WAKEUP_EN_REG ) & ~mask;omap_dm_timer_write_reg (timer,OMAP_TIMER_WAKEUP_EN_REG , l); -/* Save the context */ - timer->context.tier &= ~mask; - timer->context.twer &= ~mask;omap_dm_timer_disable (timer);return 0 ; }
@@ -756,6 +759,11 @@ static int __maybe_unused omap_dm_timer_runtime_suspend(struct device *dev)atomic_set (&timer->enabled,0 ); +if (timer->capability &OMAP_TIMER_ALWON || !timer->func_base) +return 0 ; + +omap_timer_save_context (timer); +return 0 ; }
@@ -763,6 +771,9 @@ static int __maybe_unused omap_dm_timer_runtime_resume(struct device *dev) {struct omap_dm_timer *timer =dev_get_drvdata (dev); +if (!(timer->capability &OMAP_TIMER_ALWON ) && timer->func_base) +omap_timer_restore_context (timer); +atomic_set (&timer->enabled,1 );return 0 ;
@@ -829,7 +840,11 @@ static int omap_dm_timer_probe(struct platform_device *pdev) timer->id = pdev->id; timer->capability = pdata->timer_capability; timer->reserved =omap_dm_timer_reserved_systimer (timer->id); - timer->get_context_loss_count = pdata->get_context_loss_count; + } + +if (!(timer->capability &OMAP_TIMER_ALWON )) { + timer->nb.notifier_call = omap_timer_context_notifier; +cpu_pm_register_notifier (&timer->nb); }if (pdata)
@@ -883,6 +898,8 @@ static int omap_dm_timer_remove(struct platform_device *pdev)list_for_each_entry (timer, &omap_timer_list, node)if (!strcmp (dev_name (&timer->pdev->dev),dev_name (&pdev->dev))) { +if (!(timer->capability &OMAP_TIMER_ALWON )) +cpu_pm_unregister_notifier (&timer->nb);list_del (&timer->node); ret =0 ;break ;
include/clocksource/timer-ti-dm.h +1 -2
@@ -110,13 +110,12 @@ struct omap_dm_timer { unsigned reserved:1; unsigned posted:1;struct timer_regs context; -int (*get_context_loss_count)(struct device *); -int ctx_loss_count;int revision;u32 capability;u32 errata;struct platform_device *pdev;struct list_head node; +struct notifier_block nb; };int omap_dm_timer_reserve_systimer (int id);
Signature · 1 line
2.17.1
PATCH 16/21 clocksource/drivers/timer-ti-dm: Do not update counter on updating the period
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
Write to trigger register(OMAP_TIMER_TRIGGER_REG) will load the value in Load register(OMAP_TIMER_LOAD_REG) into Counter register (OMAP_TIMER_COUNTER_REG).
omap_dm_timer_set_load() writes into trigger register every time load register is updated. When timer is configured in pwm mode, this causes disruption in current pwm cycle, which is not expected especially when pwm is used as PPS signal for synchronized PTP clocks. So do not write into trigger register on updating the period.
--- drivers/clocksource/timer-ti-dm.c | 1 - 1 file changed, 1 deletion(-)
drivers/clocksource/timer-ti-dm.c +0 -1
@@ -579,7 +579,6 @@ static int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l);omap_dm_timer_write_reg (timer,OMAP_TIMER_LOAD_REG , load); -omap_dm_timer_write_reg (timer,OMAP_TIMER_TRIGGER_REG ,0 );omap_dm_timer_disable (timer);return 0 ; }
Signature · 1 line
2.17.1
PATCH 17/21 clocksource/drivers/timer-ti-dm: Add support to get pwm current status
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
omap_dm_timer_ops provide support to configure the pwm but there is no support to get the current status. For configuring pwm it is advised to check the current hw status instead of relying on pwm framework. So implement a new timer ops to get the current status of pwm.
--- drivers/clocksource/timer-ti-dm.c | 15 +++++++++++++++ include/linux/platform_data/dmtimer-omap.h | 1 + 2 files changed, 16 insertions(+)
drivers/clocksource/timer-ti-dm.c +15 -0
@@ -627,6 +627,20 @@ static int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,return 0 ; } +static int omap_dm_timer_get_pwm_status (struct omap_dm_timer *timer) +{ +u32 l; + +if (unlikely (!timer)) +return -EINVAL ; + +omap_dm_timer_enable (timer); + l =omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG ); +omap_dm_timer_disable (timer); + +return l; +} +static int omap_dm_timer_set_prescaler (struct omap_dm_timer *timer,int prescaler) {
@@ -927,6 +941,7 @@ static const struct omap_dm_timer_ops dmtimer_ops = { .set_load = omap_dm_timer_set_load, .set_match = omap_dm_timer_set_match, .set_pwm = omap_dm_timer_set_pwm, + .get_pwm_status = omap_dm_timer_get_pwm_status, .set_prescaler = omap_dm_timer_set_prescaler, .read_counter = omap_dm_timer_read_counter, .write_counter = omap_dm_timer_write_counter,
include/linux/platform_data/dmtimer-omap.h +1 -0
@@ -36,6 +36,7 @@ struct omap_dm_timer_ops { unsigned int match);int (*set_pwm)(struct omap_dm_timer *timer,int def_on,int toggle,int trigger); +int (*get_pwm_status)(struct omap_dm_timer *timer);int (*set_prescaler)(struct omap_dm_timer *timer,int prescaler);unsigned int (*read_counter)(struct omap_dm_timer *timer);
Signature · 1 line
2.17.1
PATCH 18/21 clocksource/drivers/timer-ti-dm: Enable autoreload in set_pwm
In reply to Daniel LezcanoFrom: Lokesh Vutla <[email protected]>
dm timer ops set_load() api allows to configure the load value and to set the auto reload feature. But auto reload feature is independent of load value and should be part of configuring pwm. This way pwm can be disabled by disabling auto reload feature using set_pwm() so that the current pwm cycle will be completed. Else pwm disabling causes the cycle to be stopped abruptly.
--- drivers/clocksource/timer-ti-dm.c | 16 +++++----------- drivers/pwm/pwm-omap-dmtimer.c | 8 +++++--- include/linux/platform_data/dmtimer-omap.h | 5 ++--- 3 files changed, 12 insertions(+), 17 deletions(-)
drivers/clocksource/timer-ti-dm.c +5 -11
@@ -562,21 +562,13 @@ static int omap_dm_timer_stop(struct omap_dm_timer *timer)return 0 ; } -static int omap_dm_timer_set_load (struct omap_dm_timer *timer,int autoreload, +static int omap_dm_timer_set_load (struct omap_dm_timer *timer,unsigned int load) { -u32 l; -if (unlikely (!timer))return -EINVAL ;omap_dm_timer_enable (timer); - l =omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG ); -if (autoreload) - l |=OMAP_TIMER_CTRL_AR ; -else - l &= ~OMAP_TIMER_CTRL_AR ; -omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l);omap_dm_timer_write_reg (timer,OMAP_TIMER_LOAD_REG , load);omap_dm_timer_disable (timer);
@@ -605,7 +597,7 @@ static int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, }static int omap_dm_timer_set_pwm (struct omap_dm_timer *timer,int def_on, -int toggle,int trigger) +int toggle,int trigger,int autoreload) {u32 l;
@@ -615,12 +607,14 @@ static int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,omap_dm_timer_enable (timer); l =omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG ); l &= ~(OMAP_TIMER_CTRL_GPOCFG |OMAP_TIMER_CTRL_SCPWM | -OMAP_TIMER_CTRL_PT | (0x03 <<10 )); +OMAP_TIMER_CTRL_PT | (0x03 <<10 ) |OMAP_TIMER_CTRL_AR );if (def_on) l |=OMAP_TIMER_CTRL_SCPWM ;if (toggle) l |=OMAP_TIMER_CTRL_PT ; l |= trigger <<10 ; +if (autoreload) + l |=OMAP_TIMER_CTRL_AR ;omap_dm_timer_write_reg (timer,OMAP_TIMER_CTRL_REG , l);omap_dm_timer_disable (timer);
drivers/pwm/pwm-omap-dmtimer.c +5 -3
@@ -183,7 +183,7 @@ static int pwm_omap_dmtimer_config(struct pwm_chip *chip,if (timer_active) omap->pdata->stop (omap->dm_timer); - omap->pdata->set_load (omap->dm_timer, true, load_value); + omap->pdata->set_load (omap->dm_timer, load_value); omap->pdata->set_match (omap->dm_timer, true, match_value); dev_dbg(chip->dev, "load value: %#08x (%d), match value: %#08x (%d)\n",
@@ -192,7 +192,8 @@ static int pwm_omap_dmtimer_config(struct pwm_chip *chip, omap->pdata->set_pwm (omap->dm_timer,pwm_get_polarity (pwm) ==PWM_POLARITY_INVERSED , true, -PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE ); +PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE , + true);/* If config was called while timer was running it must be reenabled. */ if (timer_active)
@@ -222,7 +223,8 @@ static int pwm_omap_dmtimer_set_polarity(struct pwm_chip *chip, omap->pdata->set_pwm (omap->dm_timer, polarity ==PWM_POLARITY_INVERSED , true, -PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE ); +PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE , + true);mutex_unlock (&omap->mutex);return 0 ;
include/linux/platform_data/dmtimer-omap.h +2 -3
@@ -30,12 +30,11 @@ struct omap_dm_timer_ops {int (*stop)(struct omap_dm_timer *timer);int (*set_source)(struct omap_dm_timer *timer,int source); -int (*set_load)(struct omap_dm_timer *timer,int autoreload, -unsigned int value); +int (*set_load)(struct omap_dm_timer *timer,unsigned int value);int (*set_match)(struct omap_dm_timer *timer,int enable,unsigned int match);int (*set_pwm)(struct omap_dm_timer *timer,int def_on, -int toggle,int trigger); +int toggle,int trigger,int autoreload);int (*get_pwm_status)(struct omap_dm_timer *timer);int (*set_prescaler)(struct omap_dm_timer *timer,int prescaler);
Signature · 1 line
2.17.1
PATCH 19/21 clocksource/drivers/imx-tpm: Remove unused includes
In reply to Daniel LezcanoFrom: Anson Huang <[email protected]>
There is nothing in use from of_address.h/of_irq.h, remove them.
--- drivers/clocksource/timer-imx-tpm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clocksource/timer-imx-tpm.c +0 -2
@@ -8,8 +8,6 @@#include <linux/clocksource.h> #include <linux/delay.h> #include <linux/interrupt.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/sched_clock.h> #include "timer-of.h"
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 20/21 clocksource/drivers/imx-sysctr: Remove unused includes
In reply to Daniel LezcanoFrom: Anson Huang <[email protected]>
There is nothing in use from of_address.h/of_irq.h, remove them.
--- drivers/clocksource/timer-imx-sysctr.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clocksource/timer-imx-sysctr.c +0 -2
@@ -4,8 +4,6 @@#include <linux/interrupt.h> #include <linux/clockchips.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include "timer-of.h"
Signature · 1 line
2.17.1
PATCH 21/21 clocksource/drivers/timer-probe: Avoid creating dead devices
In reply to Daniel LezcanoFrom: Saravana Kannan <[email protected]>
Timer initialization is done during early boot way before the driver core starts processing devices and drivers. Timers initialized during this early boot period don't really need or use a struct device.
However, for timers represented as device tree nodes, the struct devices are still created and sit around unused and wasting memory. This change avoid this by marking the device tree nodes as "populated" if the corresponding timer is successfully initialized.
--- drivers/clocksource/timer-probe.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clocksource/timer-probe.c +2 -0
@@ -27,8 +27,10 @@ void __init timer_probe(void) init_func_ret = match->data; +of_node_set_flag (np,OF_POPULATED ); ret =init_func_ret (np);if (ret) { +of_node_clear_flag (np,OF_POPULATED );if (ret != -EPROBE_DEFER )pr_err ("Failed to initialize '%pOF': %d\n" , np, ret);
Signature · 1 line
2.17.1