aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-03 11:05:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-03 11:05:35 -0400
commit3f8ddb032afa729d4bad1bf2965d3ec068de6b72 (patch)
treef2467d1160ee8cd4016fb77c09d0f1f4c768e5fe /arch/arm
parent30307c69d59b14723fbf8a524847b302388c702d (diff)
parent8b37fcfc9b3400b647748783a2cafff67793e0ad (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock: hwspinlock: add MAINTAINERS entries hwspinlock/omap: omap_hwspinlock_remove should be __devexit hwspinlock/u8500: add hwspinlock driver hwspinlock/core: register a bank of hwspinlocks in a single API call hwspinlock/core: remove stubs for register/unregister hwspinlock/core: use a mutex to protect the radix tree hwspinlock/core/omap: fix id issues on multiple hwspinlock devices hwspinlock/omap: simplify allocation scheme hwspinlock/core: simplify 'owner' handling hwspinlock/core: simplify Kconfig Fix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of omap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c Also, do an "evil merge" to fix a compile error in omap_hsmmc.c which for some reason was reported in the same email thread as the "please pull hwspinlock changes".
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/hwspinlock.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c
index 36e21091b06a..454dfce125ca 100644
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@ -19,10 +19,15 @@
19#include <linux/kernel.h> 19#include <linux/kernel.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/err.h> 21#include <linux/err.h>
22#include <linux/hwspinlock.h>
22 23
23#include <plat/omap_hwmod.h> 24#include <plat/omap_hwmod.h>
24#include <plat/omap_device.h> 25#include <plat/omap_device.h>
25 26
27static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
28 .base_id = 0,
29};
30
26int __init hwspinlocks_init(void) 31int __init hwspinlocks_init(void)
27{ 32{
28 int retval = 0; 33 int retval = 0;
@@ -40,7 +45,9 @@ int __init hwspinlocks_init(void)
40 if (oh == NULL) 45 if (oh == NULL)
41 return -EINVAL; 46 return -EINVAL;
42 47
43 pdev = omap_device_build(dev_name, 0, oh, NULL, 0, NULL, 0, false); 48 pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
49 sizeof(struct hwspinlock_pdata),
50 NULL, 0, false);
44 if (IS_ERR(pdev)) { 51 if (IS_ERR(pdev)) {
45 pr_err("Can't build omap_device for %s:%s\n", dev_name, 52 pr_err("Can't build omap_device for %s:%s\n", dev_name,
46 oh_name); 53 oh_name);