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

Commit 09cbbf0c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.2' of... 

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

Pull clockevents/clocksource changes from Daniel Lezcano:

  - Removed dead code in the files related to mach-msm for qcom (Stephen Boyd)
  - Cleaned up code for exynos_mct (Krzysztof Kozlowski)
  - Added the new timer lpc3220 (Joachim Eastwood)
  - Added the new timer STM32 and ARM system timer (Maxime Coquelin)
parents be3ef76e d4688bdc

Documentation/devicetree/bindings/arm/armv7m_systick.txt

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
* ARMv7M System Timer



ARMv7-M includes a system timer, known as SysTick. Current driver only

implements the clocksource feature.



Required properties:

- compatible	  : Should be "arm,armv7m-systick"

- reg		  : The address range of the timer



Required clocking property, have to be one of:

- clocks	  : The input clock of the timer

- clock-frequency : The rate in HZ in input of the ARM SysTick



Examples:



systick: timer@e000e010 {

	compatible = "arm,armv7m-systick";

	reg = <0xe000e010 0x10>;

	clocks = <&clk_systick>;

};



systick: timer@e000e010 {

	compatible = "arm,armv7m-systick";

	reg = <0xe000e010 0x10>;

	clock-frequency = <90000000>;

};

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

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
* NXP LPC3220 timer



The NXP LPC3220 timer is used on a wide range of NXP SoCs. This

includes LPC32xx, LPC178x, LPC18xx and LPC43xx parts.



Required properties:

- compatible:

	Should be "nxp,lpc3220-timer".

- reg:

	Address and length of the register set.

- interrupts:

	Reference to the timer interrupt

- clocks:

	Should contain a reference to timer clock.

- clock-names:

	Should contain "timerclk".



Example:



timer1: timer@40085000 {

	compatible = "nxp,lpc3220-timer";

	reg = <0x40085000 0x1000>;

	interrupts = <13>;

	clocks = <&ccu1 CLK_CPU_TIMER1>;

	clock-names = "timerclk";

};

Documentation/devicetree/bindings/timer/st,stm32-timer.txt

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
. STMicroelectronics STM32 timer



The STM32 MCUs family has several general-purpose 16 and 32 bits timers.



Required properties:

- compatible : Should be "st,stm32-timer"

- reg : Address and length of the register set

- clocks : Reference on the timer input clock

- interrupts : Reference to the timer interrupt



Optional properties:

- resets: Reference to a reset controller asserting the timer



Example:



timer5: timer@40000c00 {

	compatible = "st,stm32-timer";

	reg = <0x40000c00 0x400>;

	interrupts = <50>;

	resets = <&rrc 259>;

	clocks = <&clk_pmtr1>;

};

drivers/clocksource/Kconfig

+17 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,16 @@ config CLKSRC_EFM32 
	  Support to use the timers of EFM32 SoCs as clock source and clock

	  Support to use the timers of EFM32 SoCs as clock source and clock

	  event device.

	  event device.





config CLKSRC_LPC32XX

	bool

	select CLKSRC_MMIO

	select CLKSRC_OF



config CLKSRC_STM32

	bool "Clocksource for STM32 SoCs" if COMPILE_TEST

	depends on OF

	select CLKSRC_MMIO



config ARM_ARCH_TIMER

config ARM_ARCH_TIMER

	bool

	bool

	select CLKSRC_OF if OF

	select CLKSRC_OF if OF
@@ -139,6 +149,13 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK 
	help

	help

	 Use ARM global timer clock source as sched_clock

	 Use ARM global timer clock source as sched_clock





config ARMV7M_SYSTICK

	bool

	select CLKSRC_OF if OF

	select CLKSRC_MMIO

	help

	  This options enables support for the ARMv7M system timer unit



config ATMEL_PIT

config ATMEL_PIT

	select CLKSRC_OF if OF

	select CLKSRC_OF if OF

	def_bool SOC_AT91SAM9 || SOC_SAMA5

	def_bool SOC_AT91SAM9 || SOC_SAMA5

drivers/clocksource/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,7 +36,9 @@ obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o 
obj-$(CONFIG_ARCH_BCM_MOBILE)	+= bcm_kona_timer.o

obj-$(CONFIG_ARCH_BCM_MOBILE)	+= bcm_kona_timer.o

obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o

obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o

obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32.o

obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32.o

obj-$(CONFIG_CLKSRC_STM32)	+= timer-stm32.o

obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o

obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o

obj-$(CONFIG_CLKSRC_LPC32XX)	+= time-lpc32xx.o

obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o

obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o

obj-$(CONFIG_FSL_FTM_TIMER)	+= fsl_ftm_timer.o

obj-$(CONFIG_FSL_FTM_TIMER)	+= fsl_ftm_timer.o

obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o

obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o
@@ -45,6 +47,7 @@ obj-$(CONFIG_MTK_TIMER) += mtk_timer.o 




obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o

obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o

obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o

obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o

obj-$(CONFIG_ARMV7M_SYSTICK)		+= armv7m_systick.o

obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o

obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o

obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)	+= dummy_timer.o

obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)	+= dummy_timer.o

obj-$(CONFIG_ARCH_KEYSTONE)		+= timer-keystone.o

obj-$(CONFIG_ARCH_KEYSTONE)		+= timer-keystone.o