Merge tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

Pull hwspinlock updates from Ohad Ben-Cohen: - hwspinlock core DT support from Suman Anna - OMAP hwspinlock DT support from Suman Anna - QCOM hwspinlock DT support from Bjorn Andersson - a new CSR atlas7 hwspinlock driver from Wei Chen - CSR atlas7 hwspinlock DT binding document from Wei Chen - a tiny QCOM hwspinlock driver fix from Bjorn Andersson * tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock: hwspinlock: qcom: Correct msb in regmap_field DT: hwspinlock: add the CSR atlas7 hwspinlock bindings document hwspinlock: add a CSR atlas7 driver hwspinlock: qcom: Add support for Qualcomm HW Mutex block DT: hwspinlock: Add binding documentation for Qualcomm hwmutex hwspinlock/omap: add support for dt nodes Documentation: dt: add the omap hwspinlock bindings document hwspinlock/core: add device tree support Documentation: dt: add common bindings for hwspinlock

Linus Torvalds committed 11 years ago

Commit d033ed92 parents 6361c84 bd5717a15 files · +605 −68Browse files

Showing the changes to include (1 of 15 files). Show all

Unified · Split

include/linux/hwspinlock.h+7−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	26	#define HWLOCK_IRQ 0x02 /* Disable interrupts, don't save state */
27	27
28	28	struct device;
	29	+struct device_node;
29	30	struct hwspinlock;
30	31	struct hwspinlock_device;
31	32	struct hwspinlock_ops;
@@ -66,6 +67,7 @@ int hwspin_lock_unregister(struct hwspinlock_device *bank); · 34 unmodified lines
66	67	struct hwspinlock *hwspin_lock_request(void);
67	68	struct hwspinlock *hwspin_lock_request_specific(unsigned int id);
68	69	int hwspin_lock_free(struct hwspinlock *hwlock);
	70	+int of_hwspin_lock_get_id(struct device_node *np, int index);
69	71	int hwspin_lock_get_id(struct hwspinlock *hwlock);
70	72	int __hwspin_lock_timeout(struct hwspinlock *, unsigned int, int,
71	73	unsigned long *);
@@ -120,6 +122,11 @@ void __hwspin_unlock(struct hwspinlock hwlock, int mode, unsigned long flags) · 48 unmodified lines
120	122	{
121	123	}
122	124
	125	+static inline int of_hwspin_lock_get_id(struct device_node *np, int index)
	126	+{
	127	+ return 0;
	128	+}
	129	+
123	130	static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)
124	131	{
125	132	return 0;