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

Commit f40d149b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'clockevents/3.20' of... 

Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux

 into timers/core

Pull clockevents updates from Daniel Lezcano:

   - Add new driver for the Conexant Digicolor SoCs (Baruch Siach)

   - Add new driver for the rockchip rk3288 board (Daniel Lezcano)

   - Add new asm9260 driver for MIPS (Oleksij Rempel)

   - Add DT definitions for the versatile AB/PB boards (Rob Herring)

   - Rename the 'marco' timer to 'atlas7' (Barry Song)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4ebbda52 35a8578e

Documentation/devicetree/bindings/arm/versatile-sysreg.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
ARM Versatile system registers

--------------------------------------



This is a system control registers block, providing multiple low level

platform functions like board detection and identification, software

interrupt generation, MMC and NOR Flash control etc.



Required node properties:

- compatible value : = "arm,versatile-sysreg", "syscon"

- reg : physical base address and the size of the registers window

Documentation/devicetree/bindings/timer/digicolor-timer.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Conexant Digicolor SoCs Timer Controller



Required properties:



- compatible : should be "cnxt,cx92755-timer"

- reg : Specifies base physical address and size of the "Agent Communication"

  timer registers

- interrupts : Contains 8 interrupts, one for each timer

- clocks: phandle to the main clock



Example:



	timer@f0000fc0 {

		compatible = "cnxt,cx92755-timer";

		reg = <0xf0000fc0 0x40>;

		interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>;

		clocks = <&main_clk>;

	};

Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Rockchip rk3288 timer



Required properties:

- compatible: shall be "rockchip,rk3288-timer"

- reg: base address of the timer register starting with TIMERS CONTROL register

- interrupts: should contain the interrupts for Timer0

- clocks : must contain an entry for each entry in clock-names

- clock-names : must include the following entries:

  "timer", "pclk"



Example:

	timer: timer@ff810000 {

		compatible = "rockchip,rk3288-timer";

		reg = <0xff810000 0x20>;

		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&xin24m>, <&cru PCLK_TIMER>;

		clock-names = "timer", "pclk";

	};

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ S: Maintained 
F:	arch/arm/mach-prima2/

F:	drivers/clk/sirf/

F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-marco.c

F:	drivers/clocksource/timer-atlas7.c

N:	[^a-z]sirf



ARM/EBSA110 MACHINE SUPPORT

arch/arm/boot/dts/versatile-ab.dts

+5 −0
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ 
			#size-cells = <1>;

			ranges = <0 0x10000000 0x10000>;



			sysreg@0 {

				compatible = "arm,versatile-sysreg", "syscon";

				reg = <0x00000 0x1000>;

			};



			aaci@4000 {

				compatible = "arm,primecell";

				reg = <0x4000 0x1000>;