From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbbJMJYO (ORCPT ); Tue, 13 Oct 2015 05:24:14 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34623 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbbJMJYL (ORCPT ); Tue, 13 Oct 2015 05:24:11 -0400 Date: Tue, 13 Oct 2015 10:24:07 +0100 From: Lee Jones To: Charles Keepax Cc: patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, rf@opensource.wolfsonmicro.com, sameo@linux.intel.com Subject: Re: [PATCH v2 2/6] mfd: arizona: factor out checking of jack detection state Message-ID: <20151013092407.GN32409@x1> References: <1443788955-7523-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1443788955-7523-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1443788955-7523-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 02 Oct 2015, Charles Keepax wrote: > From: Richard Fitzgerald > > 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 > Acked-by: Lee Jones > Signed-off-by: Charles Keepax > --- > 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