linux-next: manual merge of the watchdog tree with the arm tree

linux-next: manual merge of the watchdog tree with the arm tree

[Stephen Rothwell]

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)

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Russell King]

On Fri, Mar 20, 2009 at 01:58:49PM +1100, Stephen Rothwell wrote:
> 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.

Wim, what changes are you carrying to this driver which also touch its
clk API use?  Please send these changes to me.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Wim Van Sebroeck]

Hi Russel,

> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Wim, what changes are you carrying to this driver which also touch its
> clk API use?  Please send these changes to me.

None that touch the clk API. I deleted some spaces before the comment(s)
so that the total line length get less then 81 bytes. (This is part of
bringing the watchdog drivers in line with normal Coding style).

I'll change the iwatchdog tree so that we don't have a conflict anymore.
Will be done in a couple of minutes.

Kind regards,
Wim.

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Wim Van Sebroeck]

Hi Stephen,

> 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.

I redid the tree so that that commit doesn't add the omap part again.
So should be fixed tomorrow.

Kind regards,
Wim.

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

Hi Wim,

On Fri, 20 Mar 2009 10:15:51 +0100 Wim Van Sebroeck <wim@iguana.be> wrote:
>
> I redid the tree so that that commit doesn't add the omap part again.
> So should be fixed tomorrow.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the watchdog tree with the arm tree

[Stephen Rothwell]

Hi Wim,

Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/Makefile between commit
3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
orion5x_wdt to orion_wdt") from the arm tree and commit
e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
watchdog driver") from the watchdog tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/watchdog/Makefile
index c3afa14,9eb74b7..0000000
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -40,7 -41,8 +41,8 @@@ obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx
  obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
  obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
  obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
 -obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o
 +obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
+ obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
  
  # AVR32 Architecture
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Wim Van Sebroeck]

Hi Stephen,

> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/Makefile between commit
> 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
> orion5x_wdt to orion_wdt") from the arm tree and commit
> e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
> watchdog driver") from the watchdog tree.

It would have been nice if the orion watchdog rename patch would have been
sent to the watchdog maintainer also...

> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

I'll have a look at the commit and might pull it into the watchdog tree also.
That way you shouldn't have any problem with it.

Kind regards,
Wim.

Re: linux-next: manual merge of the watchdog tree with the arm tree

[Nicolas Pitre]

On Tue, 9 Jun 2009, Wim Van Sebroeck wrote:

> Hi Stephen,
> 
> > Today's linux-next merge of the watchdog tree got a conflict in
> > drivers/watchdog/Makefile between commit
> > 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
> > orion5x_wdt to orion_wdt") from the arm tree and commit
> > e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
> > watchdog driver") from the watchdog tree.
> 
> It would have been nice if the orion watchdog rename patch would have been
> sent to the watchdog maintainer also...

The patch has implications touching 2 different ARM subarchitectures 
outside the driver itself, so I felt it more appropriate for the rename 
to happen all at once and be carried through the ARM tree.  The driver 
sees no functional changes.
But I agree that I could have sent you a note.

> > Just context changes.  I fixed it up (see below) and can carry the fix as
> > necessary.
> 
> I'll have a look at the commit and might pull it into the watchdog tree also.
> That way you shouldn't have any problem with it.

I don't think it'll apply cleanly to the watchdog tree without greater 
conflicts with the other ARM related changes.


Nicolas