diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 20:54:59 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 20:54:59 (GMT) |
| commit | d5f73cd6e2087fa9dd07fb87838d44c384569ee4 (patch) | |
| tree | 3167037941002ed581b34af504ee4f2da6094b6c /arch/arm/boot | |
| parent | 4b1ebb64ab765b1090aba4f627a3b13361d8f410 (diff) | |
| parent | ef8fe6fee16f178cd80cf11b21565bca95b80182 (diff) | |
| download | linux-d5f73cd6e2087fa9dd07fb87838d44c384569ee4.tar.xz | |
Merge tag 'devel-dt-arch-timer-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Few late patches to enable arch timer for omap5
using device tree.
* tag 'devel-dt-arch-timer-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP5: Enable arch timer support
ARM: OMAP: Add initialisation for the real-time counter.
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 9ac75b3..5db33f4 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -33,9 +33,21 @@ cpus { cpu@0 { compatible = "arm,cortex-a15"; + timer { + compatible = "arm,armv7-timer"; + /* 14th PPI IRQ, active low level-sensitive */ + interrupts = <1 14 0x308>; + clock-frequency = <6144000>; + }; }; cpu@1 { compatible = "arm,cortex-a15"; + timer { + compatible = "arm,armv7-timer"; + /* 14th PPI IRQ, active low level-sensitive */ + interrupts = <1 14 0x308>; + clock-frequency = <6144000>; + }; }; }; |