linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the hwspinlock tree with the arm-soc tree
@ 2011-10-11  8:05 Stephen Rothwell
  2011-10-11  8:15 ` Ohad Ben-Cohen
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2011-10-11  8:05 UTC (permalink / raw)
  To: Ohad Ben-Cohen; +Cc: linux-next, linux-kernel, Kevin Hilman, Arnd Bergmann

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

Hi Ohad,

Today's linux-next merge of the hwspinlock tree got a conflict in
arch/arm/mach-omap2/hwspinlock.c between commit 3528c58eb9e8 ("OMAP:
omap_device: when building return platform_device instead of
omap_device") from the arm-soc tree and commit c3c1250e93a7
("hwspinlock/core/omap: fix id issues on multiple hwspinlock devices")
from the hwspinlock tree.

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

diff --cc arch/arm/mach-omap2/hwspinlock.c
index 0b3ae9d,eb7e509..0000000
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -48,13 -53,14 +53,14 @@@ int __init hwspinlocks_init(void
  	if (oh == NULL)
  		return -EINVAL;
  
- 	pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
 -	od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++	pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+ 				sizeof(struct hwspinlock_pdata),
  				omap_spinlock_latency,
  				ARRAY_SIZE(omap_spinlock_latency), false);
 -	if (IS_ERR(od)) {
 +	if (IS_ERR(pdev)) {
  		pr_err("Can't build omap_device for %s:%s\n", dev_name,
  								oh_name);
 -		retval = PTR_ERR(od);
 +		retval = PTR_ERR(pdev);
  	}
  
  	return retval;

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the hwspinlock tree with the arm-soc tree
  2011-10-11  8:05 linux-next: manual merge of the hwspinlock tree with the arm-soc tree Stephen Rothwell
@ 2011-10-11  8:15 ` Ohad Ben-Cohen
  0 siblings, 0 replies; 4+ messages in thread
From: Ohad Ben-Cohen @ 2011-10-11  8:15 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kevin Hilman, Arnd Bergmann

On Tue, Oct 11, 2011 at 10:05 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, Stephen, thanks a lot !

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the hwspinlock tree with the arm-soc tree
  2011-11-01  6:56 Stephen Rothwell
@ 2011-11-01  7:23 ` Ohad Ben-Cohen
  0 siblings, 0 replies; 4+ messages in thread
From: Ohad Ben-Cohen @ 2011-11-01  7:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Kevin Hilman, Benoit Cousson, Arnd Bergmann

Hi Stephen,

On Tue, Nov 1, 2011 at 8:56 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (see below) anc can carry the fix as necessary.

Looks good, thanks a lot !

Ohad.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the hwspinlock tree with the arm-soc tree
@ 2011-11-01  6:56 Stephen Rothwell
  2011-11-01  7:23 ` Ohad Ben-Cohen
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2011-11-01  6:56 UTC (permalink / raw)
  To: Ohad Ben-Cohen
  Cc: linux-next, linux-kernel, Kevin Hilman, Benoit Cousson, Arnd Bergmann

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

Hi Ohad,

Today's linux-next merge of the hwspinlock tree got a conflict in
arch/arm/mach-omap2/hwspinlock.c between commits 3528c58eb9e8 ("OMAP:
omap_device: when building return platform_device instead of
omap_device") and f718e2c034bf ("ARM: OMAP2+: devices: Remove all
omap_device_pm_latency structures") from the arm-soc tree and commit
c3c1250e93a7 ("hwspinlock/core/omap: fix id issues on multiple hwspinlock
devices") from the hwspinlock tree.

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

diff --cc arch/arm/mach-omap2/hwspinlock.c
index 36e2109,eb7e509..0000000
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -23,6 -24,18 +24,10 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
  
+ static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
+ 	.base_id = 0,
+ };
+ 
 -struct omap_device_pm_latency omap_spinlock_latency[] = {
 -	{
 -		.deactivate_func = omap_device_idle_hwmods,
 -		.activate_func   = omap_device_enable_hwmods,
 -		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 -	}
 -};
 -
  int __init hwspinlocks_init(void)
  {
  	int retval = 0;
@@@ -40,11 -53,14 +45,13 @@@
  	if (oh == NULL)
  		return -EINVAL;
  
- 	pdev = omap_device_build(dev_name, 0, oh, NULL, 0, NULL, 0, false);
 -	od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++	pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+ 				sizeof(struct hwspinlock_pdata),
 -				omap_spinlock_latency,
 -				ARRAY_SIZE(omap_spinlock_latency), false);
 -	if (IS_ERR(od)) {
++				NULL, 0, false);
 +	if (IS_ERR(pdev)) {
  		pr_err("Can't build omap_device for %s:%s\n", dev_name,
  								oh_name);
 -		retval = PTR_ERR(od);
 +		retval = PTR_ERR(pdev);
  	}
  
  	return retval;

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-11-01  7:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-11  8:05 linux-next: manual merge of the hwspinlock tree with the arm-soc tree Stephen Rothwell
2011-10-11  8:15 ` Ohad Ben-Cohen
2011-11-01  6:56 Stephen Rothwell
2011-11-01  7:23 ` Ohad Ben-Cohen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).