Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423083AbbD2M07 (ORCPT ); Wed, 29 Apr 2015 08:26:59 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:33345 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422956AbbD2M04 (ORCPT ); Wed, 29 Apr 2015 08:26:56 -0400 Date: Wed, 29 Apr 2015 13:26:51 +0100 From: Lee Jones To: Charles Keepax Cc: broonie@kernel.org, sameo@linux.intel.com, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH v2 2/9] mfd: arizona: Factor out hard reset into helper functions Message-ID: <20150429122651.GG9169@x1> References: <1429260146-16694-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1429260146-16694-3-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: <1429260146-16694-3-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 Content-Length: 2644 Lines: 80 On Fri, 17 Apr 2015, Charles Keepax wrote: > This patch adds functions for enabling and disabling the physical reset > line. This will be helpful in future refactoring. > > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-core.c | 25 +++++++++++++++++-------- > 1 files changed, 17 insertions(+), 8 deletions(-) Acked-by: Lee Jones > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index be8b1a4..c0e8a96 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -250,6 +250,20 @@ static int arizona_wait_for_boot(struct arizona *arizona) > return ret; > } > > +static inline void arizona_enable_reset(struct arizona *arizona) > +{ > + if (arizona->pdata.reset) > + gpio_set_value_cansleep(arizona->pdata.reset, 0); > +} > + > +static void arizona_disable_reset(struct arizona *arizona) > +{ > + if (arizona->pdata.reset) { > + gpio_set_value_cansleep(arizona->pdata.reset, 1); > + msleep(1); > + } > +} > + > static int arizona_apply_hardware_patch(struct arizona* arizona) > { > unsigned int fll, sysclk; > @@ -751,10 +765,7 @@ int arizona_dev_init(struct arizona *arizona) > goto err_enable; > } > > - if (arizona->pdata.reset) { > - gpio_set_value_cansleep(arizona->pdata.reset, 1); > - msleep(1); > - } > + arizona_disable_reset(arizona); > > regcache_cache_only(arizona->regmap, false); > > @@ -1054,8 +1065,7 @@ int arizona_dev_init(struct arizona *arizona) > err_irq: > arizona_irq_exit(arizona); > err_reset: > - if (arizona->pdata.reset) > - gpio_set_value_cansleep(arizona->pdata.reset, 0); > + arizona_enable_reset(arizona); > regulator_disable(arizona->dcvdd); > err_enable: > regulator_bulk_disable(arizona->num_core_supplies, > @@ -1080,8 +1090,7 @@ int arizona_dev_exit(struct arizona *arizona) > arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona); > arizona_free_irq(arizona, ARIZONA_IRQ_CLKGEN_ERR, arizona); > arizona_irq_exit(arizona); > - if (arizona->pdata.reset) > - gpio_set_value_cansleep(arizona->pdata.reset, 0); > + arizona_enable_reset(arizona); > > regulator_bulk_disable(arizona->num_core_supplies, > arizona->core_supplies); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/