From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wim Van Sebroeck <wim@iguana•be>
Cc: linux-next@vger•kernel.org, Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the watchdog tree with the arm tree
Date: Fri, 20 Mar 2009 13:58:49 +1100 [thread overview]
Message-ID: <20090320135849.8f71cdbc.sfr@canb.auug.org.au> (raw)
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/omap_wdt.c between commit
39a80c7f379e1c1d3e63b204b8353b7381d0a3d5 ("[ARM] omap: watchdog: convert
clocks to match by devid and conid") from the arm tree and commit
47efb2337f6f450c995712762c0bcf6ce073171f ("[WATCHDOG] More coding-style
and trivial clean-up") from the watchdog tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/watchdog/omap_wdt.c
index aa5ad6e,0b86ef1..0000000
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@@ -145,8 -146,13 +145,8 @@@ static int omap_wdt_open(struct inode *
if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
return -EBUSY;
- clk_enable(wdev->ick); /* Enable the interface clock */
- clk_enable(wdev->fck); /* Enable the functional clock */
- if (cpu_is_omap16xx())
- clk_enable(wdev->armwdt_ck); /* Enable the clock */
-
- if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
- clk_enable(wdev->mpu_wdt_ick); /* Enable the interface clock */
- clk_enable(wdev->mpu_wdt_fck); /* Enable the functional clock */
- }
++ clk_enable(wdev->ick); /* Enable the interface clock */
++ clk_enable(wdev->fck); /* Enable the functional clock */
/* initialize prescaler */
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
next reply other threads:[~2009-03-20 2:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 2:58 Stephen Rothwell [this message]
2009-03-20 8:19 ` linux-next: manual merge of the watchdog tree with the arm tree Russell King
2009-03-20 9:04 ` Wim Van Sebroeck
2009-03-20 9:15 ` Wim Van Sebroeck
2009-03-20 9:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 6:37 Stephen Rothwell
2009-06-09 12:39 ` Wim Van Sebroeck
2009-06-09 13:18 ` Nicolas Pitre
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=20090320135849.8f71cdbc.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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