Re: [PATCH v2 1/6] mfd: arizona: factor out DCVDD isolation control

[Lee Jones <lee.jones@linaro.org>]

On Fri, 02 Oct 2015, Charles Keepax wrote:

> From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> 
> Currently DCVDD isolation is enabled and disabled for
> runtime_suspend and runtime_resume. Future codecs will not
> have the isolation control so to prepare for these codecs
> this patch factors out the isolation control allowing it to
> be called as needed in the existing codec-specific switch cases.
> 
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c |  108 +++++++++++++++++++++++++-------------------
>  1 files changed, 62 insertions(+), 46 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index acf3548..29be262 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -460,6 +460,33 @@ static int wm5102_clear_write_sequencer(struct arizona *arizona)
>  }
>  
>  #ifdef CONFIG_PM
> +static int arizona_isolate_dcvdd(struct arizona *arizona)
> +{
> +	int ret;
> +
> +	ret = regmap_update_bits(arizona->regmap,
> +				 ARIZONA_ISOLATION_CONTROL,
> +				 ARIZONA_ISOLATE_DCVDD1,
> +				 ARIZONA_ISOLATE_DCVDD1);
> +	if (ret != 0)
> +		dev_err(arizona->dev, "Failed to isolate DCVDD: %d\n", ret);
> +
> +	return ret;
> +}
> +
> +static int arizona_connect_dcvdd(struct arizona *arizona)
> +{
> +	int ret;
> +
> +	ret = regmap_update_bits(arizona->regmap,
> +				 ARIZONA_ISOLATION_CONTROL,
> +				 ARIZONA_ISOLATE_DCVDD1, 0);
> +	if (ret != 0)
> +		dev_err(arizona->dev, "Failed to connect DCVDD: %d\n", ret);
> +
> +	return ret;
> +}
> +
>  static int arizona_runtime_resume(struct device *dev)
>  {
>  	struct arizona *arizona = dev_get_drvdata(dev);
> @@ -499,14 +526,9 @@ static int arizona_runtime_resume(struct device *dev)
>  	switch (arizona->type) {
>  	case WM5102:
>  		if (arizona->external_dcvdd) {
> -			ret = regmap_update_bits(arizona->regmap,
> -						 ARIZONA_ISOLATION_CONTROL,
> -						 ARIZONA_ISOLATE_DCVDD1, 0);
> -			if (ret != 0) {
> -				dev_err(arizona->dev,
> -					"Failed to connect DCVDD: %d\n", ret);
> +			ret = arizona_connect_dcvdd(arizona);
> +			if (ret != 0)
>  				goto err;
> -			}
>  		}
>  
>  		ret = wm5102_patch(arizona);
> @@ -531,14 +553,9 @@ static int arizona_runtime_resume(struct device *dev)
>  			goto err;
>  
>  		if (arizona->external_dcvdd) {
> -			ret = regmap_update_bits(arizona->regmap,
> -						 ARIZONA_ISOLATION_CONTROL,
> -						 ARIZONA_ISOLATE_DCVDD1, 0);
> -			if (ret) {
> -				dev_err(arizona->dev,
> -					"Failed to connect DCVDD: %d\n", ret);
> +			ret = arizona_connect_dcvdd(arizona);
> +			if (ret != 0)
>  				goto err;
> -			}
>  		} else {
>  			/*
>  			 * As this is only called for the internal regulator
> @@ -569,14 +586,9 @@ static int arizona_runtime_resume(struct device *dev)
>  			goto err;
>  
>  		if (arizona->external_dcvdd) {
> -			ret = regmap_update_bits(arizona->regmap,
> -						 ARIZONA_ISOLATION_CONTROL,
> -						 ARIZONA_ISOLATE_DCVDD1, 0);
> -			if (ret != 0) {
> -				dev_err(arizona->dev,
> -					"Failed to connect DCVDD: %d\n", ret);
> +			ret = arizona_connect_dcvdd(arizona);
> +			if (ret != 0)
>  				goto err;
> -			}
>  		}
>  		break;
>  	}
> @@ -609,37 +621,36 @@ static int arizona_runtime_suspend(struct device *dev)
>  		return ret;
>  	}
>  
> -	if (arizona->external_dcvdd) {
> -		ret = regmap_update_bits(arizona->regmap,
> -					 ARIZONA_ISOLATION_CONTROL,
> -					 ARIZONA_ISOLATE_DCVDD1,
> -					 ARIZONA_ISOLATE_DCVDD1);
> -		if (ret != 0) {
> -			dev_err(arizona->dev, "Failed to isolate DCVDD: %d\n",
> -				ret);
> -			return ret;
> -		}
> -	}
> -
>  	switch (arizona->type) {
>  	case WM5110:
>  	case WM8280:
> -		if (arizona->external_dcvdd)
> -			break;
> -
> -		/*
> -		 * As this is only called for the internal regulator
> -		 * (where we know voltage ranges available) it is ok
> -		 * to request an exact range.
> -		 */
> -		ret = regulator_set_voltage(arizona->dcvdd, 1175000, 1175000);
> -		if (ret < 0) {
> -			dev_err(arizona->dev,
> -				"Failed to set suspend voltage: %d\n", ret);
> -			return ret;
> +		if (arizona->external_dcvdd) {
> +			ret = arizona_isolate_dcvdd(arizona);
> +			if (ret != 0)
> +				return ret;
> +		} else {
> +			/*
> +			 * As this is only called for the internal regulator
> +			 * (where we know voltage ranges available) it is ok
> +			 * to request an exact range.
> +			 */
> +			ret = regulator_set_voltage(arizona->dcvdd,
> +						    1175000, 1175000);
> +			if (ret < 0) {
> +				dev_err(arizona->dev,
> +					"Failed to set suspend voltage: %d\n",
> +					ret);
> +				return ret;
> +			}
>  		}
>  		break;
>  	case WM5102:
> +		if (arizona->external_dcvdd) {
> +			ret = arizona_isolate_dcvdd(arizona);
> +			if (ret != 0)
> +				return ret;
> +		}
> +
>  		if (!(val & ARIZONA_JD1_ENA)) {
>  			ret = regmap_write(arizona->regmap,
>  					   ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
> @@ -652,6 +663,11 @@ static int arizona_runtime_suspend(struct device *dev)
>  		}
>  		break;
>  	default:
> +		if (arizona->external_dcvdd) {
> +			ret = arizona_isolate_dcvdd(arizona);
> +			if (ret != 0)
> +				return ret;
> +		}
>  		break;
>  	}
>  

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