lkml.org 
[lkml]   [2015]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC/PATCH 03/11] arm: omap2: timer: remove __omap_gptimer_init()
    Date
    since now we can reuse __omap_sync32k_timer_init()
    for OMAP3-like devices, we can safely remove
    __omap_gptimer_init().

    Signed-off-by: Felipe Balbi <balbi@ti.com>
    ---
    arch/arm/mach-omap2/timer.c | 14 ++------------
    1 file changed, 2 insertions(+), 12 deletions(-)

    diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
    index 4f9cd4b2e6b0..44db46ccd474 100644
    --- a/arch/arm/mach-omap2/timer.c
    +++ b/arch/arm/mach-omap2/timer.c
    @@ -596,16 +596,6 @@ static inline void __init realtime_counter_init(void)
    {}
    #endif

    -static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src,
    - const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
    - const char *clksrc_prop)
    -{
    - omap_clk_init();
    - omap_dmtimer_init();
    - omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);
    - omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop);
    -}
    -
    static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src,
    const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
    const char *clksrc_prop, bool gptimer)
    @@ -647,8 +637,8 @@ void __init omap3_secure_sync32k_timer_init(void)
    #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
    void __init omap3_gptimer_timer_init(void)
    {
    - __omap_gptimer_init(2, "timer_sys_ck", NULL,
    - 1, "timer_sys_ck", "ti,timer-alwon");
    + __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
    + 1, "timer_sys_ck", "ti,timer-alwon", true);
    }
    #endif

    --
    2.5.3


    \
     
     \ /
      Last update: 2015-09-29 23:01    [W:4.064 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site