Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e707eb76 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.13' of... 

Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core

Pull clockevent changes from Daniel Lezcano:

 - Factored out moxart, aspeed, cortina drivers into a generic timer fttrm010.
   Take the opportunity to add the delay timer (Linus Walleij)

 - Saved / restored tcb atmel context at suspend/resume (Alexandre Belloni)

 - Added ast2500 compatible string and fixed aspeed2500 initialization (Daniel
   Lezcano)

 - Added clock names property for aspeed (Andrew Jeffery)

 - Renamed clocksource_of to timer_of (Daniel Lezcano)

 - Added a common timer init routine (Daniel Lezcano)
parents 938e7cf2 c4779902

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

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@ Required properties: 


- compatible : Must be one of

  "faraday,fttmr010"

  "cortina,gemini-timer"

  "cortina,gemini-timer", "faraday,fttmr010"

  "moxa,moxart-timer", "faraday,fttmr010"

  "aspeed,ast2400-timer"

  "aspeed,ast2500-timer"



- reg : Should contain registers location and length

- interrupts : Should contain the three timer interrupts usually with

  flags for falling edge

Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
MOXA ART timer



Required properties:



- compatible : Must be one of:

 	- "moxa,moxart-timer"

 	- "aspeed,ast2400-timer"

- reg : Should contain registers location and length

- interrupts : Should contain the timer interrupt number

- clocks : Should contain phandle for the clock that drives the counter



Example:



	timer: timer@98400000 {

		compatible = "moxa,moxart-timer";

		reg = <0x98400000 0x42>;

		interrupts = <19 1>;

		clocks = <&coreclk>;

	};

arch/arc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ void __init setup_arch(char **cmdline_p) 
void __init time_init(void)

{

	of_clk_init(NULL);

	clocksource_probe();

	timer_probe();

}



static int __init customize_machine(void)

arch/arm/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ config ARCH_MULTIPLATFORM 
	select ARM_HAS_SG_CHAIN

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select CLKSRC_OF

	select TIMER_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI
@@ -351,7 +351,7 @@ config ARM_SINGLE_ARMV7M 
	depends on !MMU

	select ARM_NVIC

	select AUTO_ZRELADDR

	select CLKSRC_OF

	select TIMER_OF

	select COMMON_CLK

	select CPU_V7M

	select GENERIC_CLOCKEVENTS
@@ -532,7 +532,7 @@ config ARCH_PXA 
	select CLKDEV_LOOKUP

	select CLKSRC_PXA

	select CLKSRC_MMIO

	select CLKSRC_OF

	select TIMER_OF

	select CPU_XSCALE if !CPU_XSC3

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA
@@ -571,7 +571,7 @@ config ARCH_SA1100 
	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_PXA

	select CLKSRC_OF if OF

	select TIMER_OF if OF

	select CPU_FREQ

	select CPU_SA1100

	select GENERIC_CLOCKEVENTS
@@ -1357,7 +1357,7 @@ config HAVE_ARM_ARCH_TIMER 


config HAVE_ARM_TWD

	bool

	select CLKSRC_OF if OF

	select TIMER_OF if OF

	help

	  This options enables support for the ARM timer and watchdog unit

arch/arm/boot/dts/aspeed-g4.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ 
				//interrupts = <16 17 18 35 36 37 38 39>;

				interrupts = <16>;

				clocks = <&clk_apb>;

				clock-names = "PCLK";

			};



			wdt1: wdt@1e785000 {