Commit dd90cccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fixes from Thomas Gleixner:
 "A rather small update for the time(r) subsystem:

   - A new clocksource driver IMX-TPM

   - Minor fixes to the alarmtimer facility

   - Device tree cleanups for Renesas drivers

   - A new kselftest and fixes for the timer related tests

   - Conversion of the clocksource drivers to use %pOF

   - Use the proper helpers to access rlimits in the posix-cpu-timer
     code"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Ensure RTC module is not unloaded
  clocksource: Convert to using %pOF instead of full_name
  clocksource/drivers/bcm2835: Remove message for a memory allocation failure
  devicetree: bindings: Remove deprecated properties
  devicetree: bindings: Remove unused 32-bit CMT bindings
  devicetree: bindings: Deprecate property, update example
  devicetree: bindings: r8a73a4 and R-Car Gen2 CMT bindings
  devicetree: bindings: R-Car Gen2 CMT0 and CMT1 bindings
  devicetree: bindings: Remove sh7372 CMT binding
  clocksource/drivers/imx-tpm: Add imx tpm timer support
  dt-bindings: timer: Add nxp tpm timer binding doc
  posix-cpu-timers: Use dedicated helper to access rlimit values
  alarmtimer: Fix unavailable wake-up source in sysfs
  timekeeping: Use proper timekeeper for debug code
  kselftests: timers: set-timer-lat: Add one-shot timer test cases
  kselftests: timers: set-timer-lat: Tweak reporting when timer fires early
  kselftests: timers: freq-step: Fix build warning
  kselftests: timers: freq-step: Define ADJ_SETOFFSET if device has older kernel headers
parents b1b6f83a 51218298

Documentation/devicetree/bindings/timer/nxp,tpm-timer.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
NXP Low Power Timer/Pulse Width Modulation Module (TPM)



The Timer/PWM Module (TPM) supports input capture, output compare,

and the generation of PWM signals to control electric motor and power

management applications. The counter, compare and capture registers

are clocked by an asynchronous clock that can remain enabled in low

power modes. TPM can support global counter bus where one TPM drives

the counter bus for the others, provided bit width is the same.



Required properties:



- compatible :	should be "fsl,imx7ulp-tpm"

- reg :		Specifies base physical address and size of the register sets

		for the clock event device and clock source device.

- interrupts :	Should be the clock event device interrupt.

- clocks :	The clocks provided by the SoC to drive the timer, must contain

		an entry for each entry in clock-names.

- clock-names : Must include the following entries: "igp" and "per".



Example:

tpm5: tpm@40260000 {

	compatible = "fsl,imx7ulp-tpm";

	reg = <0x40260000 0x1000>;

	interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clks IMX7ULP_CLK_NIC1_BUS_DIV>,

		 <&clks IMX7ULP_CLK_LPTPM5>;

	clock-names = "ipg", "per";

};

Documentation/devicetree/bindings/timer/renesas,cmt.txt

+32 −41
Original line number Diff line number Diff line
@@ -12,46 +12,29 @@ datasheets. 
Required Properties:



  - compatible: must contain one or more of the following:

    - "renesas,cmt-32-r8a7740" for the r8a7740 32-bit CMT

		(CMT0)

    - "renesas,cmt-32-sh7372" for the sh7372 32-bit CMT

		(CMT0)

    - "renesas,cmt-32-sh73a0" for the sh73a0 32-bit CMT

		(CMT0)

    - "renesas,cmt-32" for all 32-bit CMT without fast clock support

		(CMT0 on sh7372, sh73a0 and r8a7740)

		This is a fallback for the above renesas,cmt-32-* entries.



    - "renesas,cmt-32-fast-r8a7740" for the r8a7740 32-bit CMT with fast

		clock support (CMT[234])

    - "renesas,cmt-32-fast-sh7372" for the sh7372 32-bit CMT with fast

		clock support (CMT[234])

    - "renesas,cmt-32-fast-sh73a0" for the sh73A0 32-bit CMT with fast

		clock support (CMT[234])

    - "renesas,cmt-32-fast" for all 32-bit CMT with fast clock support

		(CMT[234] on sh7372, sh73a0 and r8a7740)

		This is a fallback for the above renesas,cmt-32-fast-* entries.



    - "renesas,cmt-48-sh7372" for the sh7372 48-bit CMT

		(CMT1)

    - "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 sh7372, sh73a0 and r8a7740)

		(CMT1 on sh73a0 and r8a7740)

		This is a fallback for the above renesas,cmt-48-* entries.



    - "renesas,cmt-48-r8a73a4" for the r8a73a4 48-bit CMT

		(CMT[01])

    - "renesas,cmt-48-r8a7790" for the r8a7790 48-bit CMT

		(CMT[01])

    - "renesas,cmt-48-r8a7791" for the r8a7791 48-bit CMT

		(CMT[01])

    - "renesas,cmt-48-gen2" for all second generation 48-bit CMT

		(CMT[01] on r8a73a4, r8a7790 and r8a7791)

		This is a fallback for the renesas,cmt-48-r8a73a4,

		renesas,cmt-48-r8a7790 and renesas,cmt-48-r8a7791 entries.

    - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4.

    - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4.

    - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790.

    - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790.

    - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791.

    - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791.

    - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793.

    - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794.



    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.

    - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.

		These are fallbacks for r8a73a4 and all the R-Car Gen2

		entries	listed above.



  - reg: base address and length of the registers block for the timer module.

  - interrupts: interrupt-specifier for the timer, one per channel.
@@ -59,21 +42,29 @@ Required Properties: 
    in clock-names.

  - clock-names: must contain "fck" for the functional clock.



  - renesas,channels-mask: bitmask of the available channels.





Example: R8A7790 (R-Car H2) CMT0 node



	CMT0 on R8A7790 implements hardware channels 5 and 6 only and names

	them channels 0 and 1 in the documentation.

Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes



	cmt0: timer@ffca0000 {

		compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";

		compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0";

		reg = <0 0xffca0000 0 0x1004>;

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

			     <0 142 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_CMT0>;

		clock-names = "fck";

	};



		renesas,channels-mask = <0x60>;

	cmt1: timer@e6130000 {

		compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,

			     <0 122 IRQ_TYPE_LEVEL_HIGH>,

			     <0 123 IRQ_TYPE_LEVEL_HIGH>,

			     <0 124 IRQ_TYPE_LEVEL_HIGH>,

			     <0 125 IRQ_TYPE_LEVEL_HIGH>,

			     <0 126 IRQ_TYPE_LEVEL_HIGH>,

			     <0 127 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_CMT1>;

		clock-names = "fck";

	};

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -598,6 +598,14 @@ config CLKSRC_IMX_GPT 
	depends on ARM && CLKDEV_LOOKUP

	select CLKSRC_MMIO



config CLKSRC_IMX_TPM

	bool "Clocksource using i.MX TPM" if COMPILE_TEST

	depends on ARM && CLKDEV_LOOKUP && GENERIC_CLOCKEVENTS

	select CLKSRC_MMIO

	help

	  Enable this option to use IMX Timer/PWM Module (TPM) timer as

	  clocksource.



config CLKSRC_ST_LPC

	bool "Low power clocksource found in the LPC" if COMPILE_TEST

	select TIMER_OF if OF

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o 
obj-$(CONFIG_CLKSRC_MIPS_GIC)		+= mips-gic-timer.o

obj-$(CONFIG_CLKSRC_TANGO_XTAL)		+= tango_xtal.o

obj-$(CONFIG_CLKSRC_IMX_GPT)		+= timer-imx-gpt.o

obj-$(CONFIG_CLKSRC_IMX_TPM)		+= timer-imx-tpm.o

obj-$(CONFIG_ASM9260_TIMER)		+= asm9260_timer.o

obj-$(CONFIG_H8300_TMR8)		+= h8300_timer8.o

obj-$(CONFIG_H8300_TMR16)		+= h8300_timer16.o

drivers/clocksource/bcm2835_timer.c

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static int __init bcm2835_timer_init(struct device_node *node) 


	timer = kzalloc(sizeof(*timer), GFP_KERNEL);

	if (!timer) {

		pr_err("Can't allocate timer struct\n");

		ret = -ENOMEM;

		goto err_iounmap;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE