From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>,
Andrew Lunn <andrew@lunn.ch>, Wim Van Sebroeck <wim@iguana.be>,
linux-watchdog@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/2] Watchdog: allow orion_wdt to be built for Dove
Date: Tue, 18 Jun 2013 20:36:25 +0200 [thread overview]
Message-ID: <51C0A8A9.4070608@gmail.com> (raw)
In-Reply-To: <20130618163129.GY31667@titan.lakedaemon.net>
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@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@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
next prev parent reply other threads:[~2013-06-18 18:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 16:19 [PATCH 1/2] Watchdog: allow orion_wdt to be built for Dove Russell King
2013-06-18 16:31 ` Jason Cooper
2013-06-18 18:36 ` Sebastian Hesselbarth [this message]
2013-06-18 18:54 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51C0A8A9.4070608@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=andrew@lunn.ch \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox