diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
| commit | febbb25c8856bfe03e2a06b3f88e69f7d9d10b81 (patch) | |
| tree | b89154f29c52cf14fcef442ea4df3164e62dd7a6 /arch/arm/boot | |
| parent | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (diff) | |
| parent | 4e77f7f1261f65cff06918bc5e66d02a418fc842 (diff) | |
Merge tag 'v3.10.18' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.18-2013.11
This is the 3.10.18 stable release
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/integratorcp.dts | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts index ff1aea0ee043..72693a69f830 100644 --- a/arch/arm/boot/dts/integratorcp.dts +++ b/arch/arm/boot/dts/integratorcp.dts @@ -9,11 +9,6 @@ model = "ARM Integrator/CP"; compatible = "arm,integrator-cp"; - aliases { - arm,timer-primary = &timer2; - arm,timer-secondary = &timer1; - }; - chosen { bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; }; @@ -24,14 +19,18 @@ }; timer0: timer@13000000 { + /* TIMER0 runs @ 25MHz */ compatible = "arm,integrator-cp-timer"; + status = "disabled"; }; timer1: timer@13000100 { + /* TIMER1 runs @ 1MHz */ compatible = "arm,integrator-cp-timer"; }; timer2: timer@13000200 { + /* TIMER2 runs @ 1MHz */ compatible = "arm,integrator-cp-timer"; }; |