lkml.org 
[lkml]   [2017]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] clocksource/drivers: integrator-ap: parse the chosen node
    Date
    The driver currently uses aliases to know whether the timer is the
    clocksource or the clockevent. Add the /chosen/linux,clocksource and
    /chosen/linux,clockevent parsing while keeping backward compatibility.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    ---
    drivers/clocksource/Kconfig | 1 +
    drivers/clocksource/timer-integrator-ap.c | 11 +++++++++++
    2 files changed, 12 insertions(+)

    diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
    index 9a22d1048fcf..053aca99caf7 100644
    --- a/drivers/clocksource/Kconfig
    +++ b/drivers/clocksource/Kconfig
    @@ -212,6 +212,7 @@ config KEYSTONE_TIMER
    config INTEGRATOR_AP_TIMER
    bool "Integrator-ap timer driver" if COMPILE_TEST
    select CLKSRC_MMIO
    + select TIMER_OF
    help
    Enables support for the Integrator-ap timer.

    diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
    index 62d24690ba02..8f38be724aff 100644
    --- a/drivers/clocksource/timer-integrator-ap.c
    +++ b/drivers/clocksource/timer-integrator-ap.c
    @@ -197,6 +197,17 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
    rate = clk_get_rate(clk);
    writel(0, base + TIMER_CTRL);

    + if (timer_of_is_clocksource(node))
    + /* The primary timer lacks IRQ, use as clocksource */
    + return integrator_clocksource_init(rate, base);
    +
    + if (timer_of_is_clockevent(node)) {
    + /* The secondary timer will drive the clock event */
    + irq = irq_of_parse_and_map(node, 0);
    + return integrator_clockevent_init(rate, base, irq);
    + }
    +
    + /* DT ABI compatibility below */
    err = of_property_read_string(of_aliases,
    "arm,timer-primary", &path);
    if (err) {
    --
    2.15.1
    \
     
     \ /
      Last update: 2017-12-13 19:54    [W:3.599 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site