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 /arch/arm/boot/dts/versatile-ab.dts | |
| 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 'arch/arm/boot/dts/versatile-ab.dts')
| -rw-r--r-- | arch/arm/boot/dts/versatile-ab.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 27d0d9c8adf3..01f40197ea13 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -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>; |