aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-05 20:06:22 +0000
committerMark Brown <broonie@linaro.org>2013-11-05 20:06:22 +0000
commit7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (patch)
treef7108509cb562de12c24b91563f26bac9ca3ea96 /arch/arm/boot/dts
parent9c9a23470dc44b51230c35b93d1930e2dc2d1000 (diff)
parent4e77f7f1261f65cff06918bc5e66d02a418fc842 (diff)
downloadlinux-linaro-stable-7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2.tar.gz
Merge tag 'v3.10.18' into linux-linaro-lsk
This is the 3.10.18 stable release
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/integratorcp.dts9
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";
};