Skip to contentSkip to conversation

Revert "mfd: wm5102: Manually apply register patch"

PATCH Applied Charles Keepax 2 participants 4 messages Sep 24, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "mfd: wm5102: Manually apply register patch"

This reverts commit d9d03496f6f904a3588bdb8b215853bc4e50132c.

It seems this commit was applied twice, once through ASoC and once through MFD:

commit 4c9bb8bc352a14c9613c77bc3f1e9038cd086b9b
mfd: wm5102: Manually apply register patch

commit d9d03496f6f904a3588bdb8b215853bc4e50132c
mfd: wm5102: Manually apply register patch

This has lead to a small piece of duplicate code. It is harmless hence how it has gone unoticed for so long. This patch reverts one of the two commits removing the unneeded code.

---
 drivers/mfd/arizona-core.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
drivers/mfd/arizona-core.c +0 -12
index 4afb232..72b3202 100644
@@ -393,18 +393,6 @@ static int arizona_runtime_resume(struct device *dev)
 		break;
 	}
 
-	switch (arizona->type) {
-	case WM5102:
-		ret = wm5102_patch(arizona);
-		if (ret != 0) {
-			dev_err(arizona->dev, "Failed to apply patch: %d\n",
-				ret);
-			goto err;
-		}
-	default:
-		break;
-	}
-
 	ret = regcache_sync(arizona->regmap);
 	if (ret != 0) {
 		dev_err(arizona->dev, "Failed to restore register cache\n");
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 2/2 mfd: arizona: Correct mask to allow setting micbias external cap

Currently the mask for the external capacitor bit is missing when writing the MICBIAS config meaning it will never be set this patch fixes this.

---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mfd/arizona-core.c +1 -0
index 72b3202..bce7c07 100644
@@ -947,6 +947,7 @@ int arizona_dev_init(struct arizona *arizona)
 		regmap_update_bits(arizona->regmap,
 				   ARIZONA_MIC_BIAS_CTRL_1 + i,
 				   ARIZONA_MICB1_LVL_MASK |
+				   ARIZONA_MICB1_EXT_CAP |
 				   ARIZONA_MICB1_DISCH |
 				   ARIZONA_MICB1_BYPASS |
 				   ARIZONA_MICB1_RATE, val);
Signature · 1 line
1.7.2.5
Applied
#2 lore raw

Re: [PATCH 2/2] mfd: arizona: Correct mask to allow setting micbias external cap

Quoted 8 lines · Charles Keepax

Currently the mask for the external capacitor bit is missing when writing the MICBIAS config meaning it will never be set this patch fixes this.

---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Quoted 12 lines
drivers/mfd/arizona-core.c +1 -0
index 72b3202..bce7c07 100644
@@ -947,6 +947,7 @@ int arizona_dev_init(struct arizona *arizona)
 		regmap_update_bits(arizona->regmap,
 				   ARIZONA_MIC_BIAS_CTRL_1 + i,
 				   ARIZONA_MICB1_LVL_MASK |
+				   ARIZONA_MICB1_EXT_CAP |
 				   ARIZONA_MICB1_DISCH |
 				   ARIZONA_MICB1_BYPASS |
 				   ARIZONA_MICB1_RATE, val);
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#3 lore raw
In reply to Charles Keepax
Quoted 11 lines · Charles Keepax

This reverts commit d9d03496f6f904a3588bdb8b215853bc4e50132c.

It seems this commit was applied twice, once through ASoC and once through MFD:

commit 4c9bb8bc352a14c9613c77bc3f1e9038cd086b9b
mfd: wm5102: Manually apply register patch

commit d9d03496f6f904a3588bdb8b215853bc4e50132c
mfd: wm5102: Manually apply register patch

Quoted 8 lines

This has lead to a small piece of duplicate code. It is harmless hence how it has gone unoticed for so long. This patch reverts one of the two commits removing the unneeded code.

---
 drivers/mfd/arizona-core.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

Applied, thanks.

Quoted 23 lines
drivers/mfd/arizona-core.c +0 -12
index 4afb232..72b3202 100644
@@ -393,18 +393,6 @@ static int arizona_runtime_resume(struct device *dev)
 		break;
 	}
 
-	switch (arizona->type) {
-	case WM5102:
-		ret = wm5102_patch(arizona);
-		if (ret != 0) {
-			dev_err(arizona->dev, "Failed to apply patch: %d\n",
-				ret);
-			goto err;
-		}
-	default:
-		break;
-	}
-
 	ret = regcache_sync(arizona->regmap);
 	if (ret != 0) {
 		dev_err(arizona->dev, "Failed to restore register cache\n");
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog