Commit 048495eb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.7' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core 

Pull clockevent/clocksource updates from Daniel Lezcano:

- 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)
parents d441dceb 4f41fe38

Documentation/devicetree/bindings/timer/faraday,fttmr010.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/timer/ingenic,tcu.txt

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/bcm2835_timer.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE