6b775f4517
This change cherry-picks the following 3 changes from linux-next: *fb7737 hwspinlock/core: add device tree support *19a0f6 hwspinlock: qcom: Add support for Qualcomm HW Mutex block *bd5717 hwspinlock: qcom: Correct msb in regmap_field We're also adding a patch to add the hardware spinlock device nodes on IPQ806x platforms (033-soc-qcom-Add-sfbp-device-to-IPQ806x-dts.patch). Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 46655
27 lines
1003 B
Diff
27 lines
1003 B
Diff
From bd5717a4632cdecafe82d03de7dcb3b1876e2828 Mon Sep 17 00:00:00 2001
|
|
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
|
Date: Fri, 26 Jun 2015 14:47:21 -0700
|
|
Subject: [PATCH] hwspinlock: qcom: Correct msb in regmap_field
|
|
|
|
msb of the regmap_field was mistakenly given the value 32, to set all bits
|
|
in the regmap update mask; although incorrect this worked until 921cc294,
|
|
where the mask calculation was corrected.
|
|
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
|
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
|
|
---
|
|
drivers/hwspinlock/qcom_hwspinlock.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/hwspinlock/qcom_hwspinlock.c
|
|
+++ b/drivers/hwspinlock/qcom_hwspinlock.c
|
|
@@ -123,7 +123,7 @@ static int qcom_hwspinlock_probe(struct
|
|
for (i = 0; i < QCOM_MUTEX_NUM_LOCKS; i++) {
|
|
field.reg = base + i * stride;
|
|
field.lsb = 0;
|
|
- field.msb = 32;
|
|
+ field.msb = 31;
|
|
|
|
bank->lock[i].priv = devm_regmap_field_alloc(&pdev->dev,
|
|
regmap, field);
|