summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/integratorcp.dts
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-03-14 00:31:12 +0400
committerRob Herring <rob.herring@calxeda.com>2013-04-12 00:11:21 +0400
commit870e2928cf3368ca9b06bc925d0027b0a56bcd8e (patch)
tree77ab94078703065c13f0b3bf9b36f2d439883c9c /arch/arm/boot/dts/integratorcp.dts
parent818270d573674188cfe731992e66455e2e183e64 (diff)
downloadlinux-870e2928cf3368ca9b06bc925d0027b0a56bcd8e.tar.xz
ARM: integrator-cp: convert use CLKSRC_OF for timer init
Move the integrator-cp timer init to timer-sp.c and use CLKSRC_OF. There is no reason to use the aliases, so drop them from the init code. The integrator-cp timers are mistakenly called sp804 timers in the dts, but in fact they are not sp804 dual timers, but single timers with the same programming model. Fix the dts to reflect this. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/integratorcp.dts')
-rw-r--r--arch/arm/boot/dts/integratorcp.dts6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 8b119399025a..ff1aea0ee043 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -24,15 +24,15 @@
};
timer0: timer@13000000 {
- compatible = "arm,sp804", "arm,primecell";
+ compatible = "arm,integrator-cp-timer";
};
timer1: timer@13000100 {
- compatible = "arm,sp804", "arm,primecell";
+ compatible = "arm,integrator-cp-timer";
};
timer2: timer@13000200 {
- compatible = "arm,sp804", "arm,primecell";
+ compatible = "arm,integrator-cp-timer";
};
pic: pic@14000000 {