Re: [PATCH v2 2/6] mfd: arizona: factor out checking of jack detection state

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

On Fri, 02 Oct 2015, Charles Keepax wrote:

> From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> 
> Currently runtime_suspend will fully power off the codec if
> the jack detection is not enabled. Not all future codecs will
> have jack detection so to prepare for these codecs this patch
> factors out the check so that it 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 |   41 ++++++++++++++++++++++++++++++++---------
>  1 files changed, 32 insertions(+), 9 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 29be262..e32d0d3 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -487,6 +487,23 @@ static int arizona_connect_dcvdd(struct arizona *arizona)
>  	return ret;
>  }
>  
> +static int arizona_is_jack_det_active(struct arizona *arizona)
> +{
> +	unsigned int val;
> +	int ret;
> +
> +	ret = regmap_read(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, &val);
> +	if (ret) {
> +		dev_err(arizona->dev,
> +			"Failed to check jack det status: %d\n", ret);
> +		return ret;
> +	} else if (val & ARIZONA_JD1_ENA) {
> +		return 1;
> +	} else {
> +		return 0;
> +	}
> +}
> +
>  static int arizona_runtime_resume(struct device *dev)
>  {
>  	struct arizona *arizona = dev_get_drvdata(dev);
> @@ -610,20 +627,18 @@ err:
>  static int arizona_runtime_suspend(struct device *dev)
>  {
>  	struct arizona *arizona = dev_get_drvdata(dev);
> -	unsigned int val;
> +	unsigned int jd_active = 0;
>  	int ret;
>  
>  	dev_dbg(arizona->dev, "Entering AoD mode\n");
>  
> -	ret = regmap_read(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, &val);
> -	if (ret) {
> -		dev_err(dev, "Failed to check jack det status: %d\n", ret);
> -		return ret;
> -	}
> -
>  	switch (arizona->type) {
>  	case WM5110:
>  	case WM8280:
> +		jd_active = arizona_is_jack_det_active(arizona);
> +		if (jd_active < 0)
> +			return jd_active;
> +
>  		if (arizona->external_dcvdd) {
>  			ret = arizona_isolate_dcvdd(arizona);
>  			if (ret != 0)
> @@ -645,13 +660,17 @@ static int arizona_runtime_suspend(struct device *dev)
>  		}
>  		break;
>  	case WM5102:
> +		jd_active = arizona_is_jack_det_active(arizona);
> +		if (jd_active < 0)
> +			return jd_active;
> +
>  		if (arizona->external_dcvdd) {
>  			ret = arizona_isolate_dcvdd(arizona);
>  			if (ret != 0)
>  				return ret;
>  		}
>  
> -		if (!(val & ARIZONA_JD1_ENA)) {
> +		if (!jd_active) {
>  			ret = regmap_write(arizona->regmap,
>  					   ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
>  			if (ret) {
> @@ -663,6 +682,10 @@ static int arizona_runtime_suspend(struct device *dev)
>  		}
>  		break;
>  	default:
> +		jd_active = arizona_is_jack_det_active(arizona);
> +		if (jd_active < 0)
> +			return jd_active;
> +
>  		if (arizona->external_dcvdd) {
>  			ret = arizona_isolate_dcvdd(arizona);
>  			if (ret != 0)
> @@ -676,7 +699,7 @@ static int arizona_runtime_suspend(struct device *dev)
>  	regulator_disable(arizona->dcvdd);
>  
>  	/* Allow us to completely power down if no jack detection */
> -	if (!(val & ARIZONA_JD1_ENA)) {
> +	if (!jd_active) {
>  		dev_dbg(arizona->dev, "Fully powering off\n");
>  
>  		arizona->has_fully_powered_off = true;

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