linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ohad Ben-Cohen <ohad@wizery.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Kevin Hilman <khilman@ti.com>, Benoit Cousson <b-cousson@ti.com>,
	Arnd Bergmann <arnd@arndb.de>
Subject: linux-next: manual merge of the hwspinlock tree with the arm-soc tree
Date: Tue, 1 Nov 2011 17:56:02 +1100	[thread overview]
Message-ID: <20111101175602.a1cc534d3819edcb8cd2cc77@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2011-11-01  6:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-01  6:56 Stephen Rothwell [this message]
2011-11-01  7:23 ` linux-next: manual merge of the hwspinlock tree with the arm-soc tree Ohad Ben-Cohen
  -- strict thread matches above, loose matches on Subject: below --
2011-10-11  8:05 Stephen Rothwell
2011-10-11  8:15 ` Ohad Ben-Cohen

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=20111101175602.a1cc534d3819edcb8cd2cc77@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=b-cousson@ti.com \
    --cc=khilman@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ohad@wizery.com \
    /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;
as well as URLs for NNTP newsgroup(s).