diff options
-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 @@ | |||
9 | model = "ARM Integrator/CP"; | 9 | model = "ARM Integrator/CP"; |
10 | compatible = "arm,integrator-cp"; | 10 | compatible = "arm,integrator-cp"; |
11 | 11 | ||
12 | aliases { | ||
13 | arm,timer-primary = &timer2; | ||
14 | arm,timer-secondary = &timer1; | ||
15 | }; | ||
16 | |||
17 | chosen { | 12 | chosen { |
18 | bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; | 13 | bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; |
19 | }; | 14 | }; |
@@ -24,14 +19,18 @@ | |||
24 | }; | 19 | }; |
25 | 20 | ||
26 | timer0: timer@13000000 { | 21 | timer0: timer@13000000 { |
22 | /* TIMER0 runs @ 25MHz */ | ||
27 | compatible = "arm,integrator-cp-timer"; | 23 | compatible = "arm,integrator-cp-timer"; |
24 | status = "disabled"; | ||
28 | }; | 25 | }; |
29 | 26 | ||
30 | timer1: timer@13000100 { | 27 | timer1: timer@13000100 { |
28 | /* TIMER1 runs @ 1MHz */ | ||
31 | compatible = "arm,integrator-cp-timer"; | 29 | compatible = "arm,integrator-cp-timer"; |
32 | }; | 30 | }; |
33 | 31 | ||
34 | timer2: timer@13000200 { | 32 | timer2: timer@13000200 { |
33 | /* TIMER2 runs @ 1MHz */ | ||
35 | compatible = "arm,integrator-cp-timer"; | 34 | compatible = "arm,integrator-cp-timer"; |
36 | }; | 35 | }; |
37 | 36 | ||