lkml.org 
[lkml]   [2013]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 05/11] ARM: OMAP2+: Divorce from local timer API
    Date
    Now that the TWD doesn't rely on the local timer API, OMAP can
    stop selecting it in Kconfig and relying on the config option to
    decide if it should call smp_twd functions.

    Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    ---
    arch/arm/mach-omap2/Kconfig | 1 -
    arch/arm/mach-omap2/timer.c | 7 -------
    2 files changed, 8 deletions(-)

    diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
    index 8111cd9..1b731e3 100644
    --- a/arch/arm/mach-omap2/Kconfig
    +++ b/arch/arm/mach-omap2/Kconfig
    @@ -88,7 +88,6 @@ config ARCH_OMAP4
    select CACHE_L2X0
    select CPU_V7
    select HAVE_SMP
    - select LOCAL_TIMERS if SMP
    select OMAP_INTERCONNECT
    select PL310_ERRATA_588369
    select PL310_ERRATA_727915
    diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
    index 2bdd4cf..c00a8f8 100644
    --- a/arch/arm/mach-omap2/timer.c
    +++ b/arch/arm/mach-omap2/timer.c
    @@ -587,7 +587,6 @@ OMAP_SYS_GP_TIMER_INIT(3_am33xx, 1, OMAP4_MPU_SOURCE, "ti,timer-alwon",
    #ifdef CONFIG_ARCH_OMAP4
    OMAP_SYS_32K_TIMER_INIT(4, 1, OMAP4_32K_SOURCE, "ti,timer-alwon",
    2, OMAP4_MPU_SOURCE);
    -#ifdef CONFIG_LOCAL_TIMERS
    static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
    void __init omap4_local_timer_init(void)
    {
    @@ -606,12 +605,6 @@ void __init omap4_local_timer_init(void)
    pr_err("twd_local_timer_register failed %d\n", err);
    }
    }
    -#else /* CONFIG_LOCAL_TIMERS */
    -void __init omap4_local_timer_init(void)
    -{
    - omap4_sync32k_timer_init();
    -}
    -#endif /* CONFIG_LOCAL_TIMERS */
    #endif /* CONFIG_ARCH_OMAP4 */

    #ifdef CONFIG_SOC_OMAP5
    --
    The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
    hosted by The Linux Foundation


    \
     
     \ /
      Last update: 2013-04-09 03:41    [W:3.584 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site