diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
| commit | f40d149b58f5dea148ceaee5f9249da133e5004c (patch) | |
| tree | 413b03df98cb9b2d8e877481dfd0795a89dedc7d /Documentation/devicetree/bindings/timer | |
| parent | 4ebbda5251374d532ba8939de4241d769d1420b6 (diff) | |
| parent | 35a8578e8b83eb13f8d57ab40b98bcfd5199d3d4 (diff) | |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/timer')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/digicolor-timer.txt | 18 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/timer/digicolor-timer.txt b/Documentation/devicetree/bindings/timer/digicolor-timer.txt new file mode 100644 index 000000000000..d1b659bbc29f --- /dev/null +++ b/Documentation/devicetree/bindings/timer/digicolor-timer.txt @@ -0,0 +1,18 @@ +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>; + }; diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt b/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt new file mode 100644 index 000000000000..87f0b0042bae --- /dev/null +++ b/Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt @@ -0,0 +1,18 @@ +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"; + }; |