This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init" When this code was introduced, the both aliases pointing the system to use timer1 as primary (clocksource) and timer2 as secondary (clockevent) was ignored, and the system would simply use the first two timers found as clocksource and clockevent. However this made the system timeline accelerate by a factor x25, as it turns out that the way the clocking actually works (totally undocumented and found after some trial-and-error) is that timer0 runs @ 25MHz and timer1 and timer2 runs @ 1MHz. Presumably this divider setting is a boot-on default and configurable albeit the way to configure it is not documented. So as a quick fix to the problem, let's mark timer0 as disabled, so the code will chose timer1 and timer2 as it used to. This also deletes the two aliases for the primary and secondary timer as they have been superceded by the auto-selection
Unified · Split
| @@ -9,11 +9,6 @@ · 8 unmodified lines | |||
| 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 @@ · 4 unmodified lines | |||
| 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 | ||