• Linus Walleij's avatar
    ARM: integrator: deactivate timer0 on the Integrator/CP · 29114fd7
    Linus Walleij authored
    This fixes a long-standing Integrator/CP regression from
    commit 870e2928
    "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
    
    Cc: stable@vger.kernel.org
    Cc: Rob Herring <rob.herring@calxeda.com>
    Cc: Russell King <linux@arm.linux.org.uk>
    Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    29114fd7
integratorcp.dts 2.19 KB