[PATCH 1/2] Watchdog: allow orion_wdt to be built for Dove

[Sebastian Hesselbarth]

On 06/18/2013 06:31 PM, Jason Cooper wrote:
> On Tue, Jun 18, 2013 at 05:19:32PM +0100, Russell King wrote:
>> The watchdog infrastructure in Dove is no different from that in
>> Orion5x or Kirkwood, so let's enable it for Dove.  The only things
>> missing are a few register settings in Dove's bridge-regs.h.
>>
>> Rather than duplicating the same register bit masks for the RSTOUTn_MASK
>> and BRIDGE_CAUSE registers, move the definitions into the watchdog
>> driver itself.
>>
>> Signed-off-by: Russell King<rmk+kernel at arm.linux.org.uk>
>> ---
>>   arch/arm/mach-dove/include/mach/bridge-regs.h     |    1 +
>>   arch/arm/mach-kirkwood/include/mach/bridge-regs.h |    2 --
>>   arch/arm/mach-orion5x/include/mach/bridge-regs.h  |    3 ---
>>   drivers/watchdog/Kconfig                          |    2 +-
>>   drivers/watchdog/orion_wdt.c                      |    3 +++
>>   5 files changed, 5 insertions(+), 6 deletions(-)
>
> There shouldn't be any conflicts on the mvebu side.  Wim, feel free to
> take it:
>
> Acked-by: Jason Cooper<jason at lakedaemon.net>

FWIW, you also kind of get my Acked-by, although I was silently hoping
we can postpone orion wdt until we remove non-DT ;)

With irqchip queued for 3.11, we will ack the timer irqs by a
chained irq handler. But this will be DT-only and currently also only
for Kirkwood and Dove (Orion5x DT progress is slow).

With 3.11 out, I will see how to handle wdt. Either make it non-DT/DT
aware or also move non-DT to irqchip.

Sebastian