[PATCH] ARM: shmobile: Allow build of the MTU2 timer driver

[Magnus Damm]

On Wed, Sep 25, 2013 at 2:06 PM, Simon Horman <horms at verge.net.au> wrote:
> On Wed, Sep 18, 2013 at 01:53:48PM -0700, Olof Johansson wrote:
>> Hi,
>>
>>
>> On Wed, Sep 18, 2013 at 12:50 PM, Magnus Damm <magnus.damm at gmail.com> wrote:
>> > From: Magnus Damm <damm at opensource.se>
>> >
>> > Include MTU2 in the list of timer drivers that may
>> > be used on mach-shmobile. This driver has previously
>> > only been used by the SH architecture. With this patch
>> > the MTU2 joins TMU and CMT as timer drivers that may be
>> > used on ARM or SH.
>> >
>> > Signed-off-by: Magnus Damm <damm at opensource.se>
>> > ---
>> >
>> >  arch/arm/mach-shmobile/Kconfig |    6 ++++++
>> >  1 file changed, 6 insertions(+)
>> >
>> > --- 0004/arch/arm/mach-shmobile/Kconfig
>> > +++ work/arch/arm/mach-shmobile/Kconfig 2013-09-19 04:17:55.000000000 +0900
>> > @@ -314,6 +314,12 @@ config SH_TIMER_CMT
>> >         help
>> >           This enables build of the CMT timer driver.
>> >
>> > +config SH_TIMER_MTU2
>> > +       bool "MTU2 timer driver"
>> > +       default y
>> > +       help
>> > +         This enables build of the MTU2 timer driver.
>>
>> It's odd to have the config entry in arch/arm/ when the driver is in
>> drivers/clocksource. I think this entry should be moved to
>> drivers/clocksource/Kconfig for that reason (with appropriate
>> dependencies).
>
> This sounds logical to me.
> Magnus, how do you feel about this?

Keeping it in a single location sounds good to me, but I worry a bit
about how to merge it without any conflicts.

A little while ago did I send out a first rough patch for this:

[PATCH/RFC] clocksource: Consolidate SH and ARM mach-shmobile Kconfig bits

Cheers,

/ magnus