Re: [PATCH V2 2/2] ARM: tegra: move timer.c to drivers/clocksource/

[Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>]

On 11/19/2012 05:50 PM, Josh Cartwright wrote:
> On Mon, Nov 19, 2012 at 05:27:17PM -0700, Stephen Warren wrote:
>> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>
>> Move arch/arm/mach-tegra/timer.c to drivers/clocksource/tegra20_timer.c
>> so that the code is co-located with other clocksource drivers, and to
>> reduce the size of the mach-tegra directory.
>>
>> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> ---
>> v2: Rebase on ARM sys_timer rework, and addition of clocksource_of_init().
> [..]
>> diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
>> index aeec8d2..328d18f 100644
>> --- a/drivers/clocksource/clksrc-of.c
>> +++ b/drivers/clocksource/clksrc-of.c
>> @@ -20,6 +20,10 @@
>>  #include "clksrc-of.h"
>>  
>>  static const struct of_device_id clksrc_of_match[] __initconst = {
>> +	{
>> +		.compatible = "nvidia,tegra20-timer",
>> +		.data = tegra20_init_timer,
>> +	},
> 
> Shouldn't this be wrapped in #if ARCH_TEGRA?

Yes.

> I had suggested this with Thomas Petazzoni's consolidated irq_chip patch
> as well:
> 
> It seems like it would be a bit cleaner/easier to maintain if we relied
> on the linker to stitch together a clksrc_of_match table, based on what
> clocksources are being built into the image.  With that approach, at
> least, a public initialization header wouldn't have to be exposed, and
> this central table wouldn't have to be maintained (as more clocksrcs are
> added, I forsee [admittedly trivial] merge conflicts).
> 
> Thoughts?

I thought I'd wait for Thomas' revised patch and copy that, but it
turned out to be easier that I figured to implement. So, new revision
coming soon!