From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934297AbbEMMUu (ORCPT ); Wed, 13 May 2015 08:20:50 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:35619 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934242AbbEMMUp (ORCPT ); Wed, 13 May 2015 08:20:45 -0400 Date: Wed, 13 May 2015 13:20:40 +0100 From: Lee Jones To: Charles Keepax Cc: broonie@kernel.org, lgirdwood@gmail.com, sameo@linux.intel.com, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH v3 02/10] mfd: arizona: Factor out hard reset into helper functions Message-ID: <20150513122040.GN3394@x1> References: <1431349090-24173-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1431349090-24173-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: <1431349090-24173-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 On Mon, 11 May 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 > Acked-by: Lee Jones > --- > drivers/mfd/arizona-core.c | 25 +++++++++++++++++-------- > 1 files changed, 17 insertions(+), 8 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 915cc28..f30d925 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); > > @@ -1046,8 +1057,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, > @@ -1072,8 +1082,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