Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240864

Re: [PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi,

Suman Anna <s-anna@ti.com> writes:
>> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
>> index 976ff9fa3594..d14e25b2d7a4 100644
>> --- a/arch/arm/mach-omap2/timer.c
>> +++ b/arch/arm/mach-omap2/timer.c
>> @@ -608,21 +608,13 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src
>>  		omap2_sync32k_clocksource_init();
>>  }
>>  
>> -#ifdef CONFIG_ARCH_OMAP2
>> -void __init omap2_sync32k_timer_init(void)
>> +void __init omap_sync32k_timer_init(void)
>>  {
>>  	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
>>  			2, "timer_sys_ck", NULL, false);
>>  }
>> -#endif /* CONFIG_ARCH_OMAP2 */
>>  
>>  #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
>> -void __init omap3_sync32k_timer_init(void)
>> -{
>> -	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
>> -			2, "timer_sys_ck", NULL, false);
>> -}
>> -
>>  void __init omap3_secure_sync32k_timer_init(void)
>>  {
>>  	__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
>> @@ -640,15 +632,9 @@ void __init omap3_gptimer_timer_init(void)
>>  
>>  #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
>>  	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
>> -static void __init omap4_sync32k_timer_init(void)
>> -{
>> -	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
>> -			2, "sys_clkin_ck", NULL, false);
>> -}
>> -
>>  void __init omap4_local_timer_init(void)
>>  {
>> -	omap4_sync32k_timer_init();
>> +	omap_sync32k_timer_init();
>
> Hmm, this is changing the parent clock source for the timer from
> sys_clkin_ck to timer_sys_ck for OMAP4 and OMAP5 below. I am not sure of
> the history behind the parent source, but is this what you intended to
> do here.

good catch. I'll fix this for next revision

-- 
balbi

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/11] arm: omap: counter32k rework Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
    Re: [PATCH 04/11] arm: omap2: timer: provide generic  sync32k_timer_init function Suman Anna <s-anna@ti.com> - 2015-10-06 20:40 +0200
      Re: [PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi <balbi@ti.com> - 2015-10-06 21:20 +0200
  [PATCH 02/11] arm: omap2: timer: add a gptimer argument to sync32k_timer_init() Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 06/11] arm: omap2: timer: always call clocksource_of_init() when DT Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
    Re: [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-07 01:30 +0200
      Re: [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi <balbi@TI.COM> - 2015-10-07 05:10 +0200

csiph-web