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

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

[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

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.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 4afb232..72b3202 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -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");
-- 
1.7.2.5

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

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

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 72b3202..bce7c07 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -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);
-- 
1.7.2.5

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

[Lee Jones]

On Wed, 24 Sep 2014, Charles Keepax wrote:

> 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.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c |   12 ------------
>  1 files changed, 0 insertions(+), 12 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 4afb232..72b3202 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -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");

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

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

[Lee Jones]

On Wed, 24 Sep 2014, Charles Keepax wrote:

> 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.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 72b3202..bce7c07 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -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);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog