lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 140/144] clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer"
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dinh Nguyen <dinguyen@altera.com>

    commit 9ab4727c1d41e50b67aecde4bf11879560a3ca78 upstream.

    In commit 620f5e1cbf (dts: Rename DW APB timer compatible strings), both
    "snps,dw-apb-timer-sp" and "snps,dw-apb-timer-osc" were deprecated in place
    of "snps,dw-apb-timer". But the driver also needs to be udpated in order to
    support this new binding "snps,dw-apb-timer".

    Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/clocksource/dw_apb_timer_of.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/clocksource/dw_apb_timer_of.c
    +++ b/drivers/clocksource/dw_apb_timer_of.c
    @@ -113,7 +113,6 @@ static u32 read_sched_clock(void)

    static const struct of_device_id sptimer_ids[] __initconst = {
    { .compatible = "picochip,pc3x2-rtc" },
    - { .compatible = "snps,dw-apb-timer-sp" },
    { /* Sentinel */ },
    };

    @@ -153,4 +152,6 @@ static void __init dw_apb_timer_init(str
    num_called++;
    }
    CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init);
    -CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer-osc", dw_apb_timer_init);
    +CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init);
    +CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init);
    +CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init);



    \
     
     \ /
      Last update: 2014-01-07 02:01    [W:4.221 / U:0.744 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site