From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965095AbcI0X56 (ORCPT ); Tue, 27 Sep 2016 19:57:58 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34374 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964946AbcI0X5m (ORCPT ); Tue, 27 Sep 2016 19:57:42 -0400 Date: Wed, 28 Sep 2016 00:59:51 +0100 From: Lee Jones To: Charles Keepax Cc: rf@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO Message-ID: <20160927235951.GP21388@dell> References: <1474385414-27665-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1474385414-27665-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: <1474385414-27665-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 20 Sep 2016, Charles Keepax wrote: > The Arizona CODECs will generally function correctly without a reset line > although it is strongly advised to have one, as such we do allow the system > to boot if the reset gpio is missing or incorrectly specified. However > we should fail probe if we get a probe deferral request, this patch adds > handling for this case. > > Reported-by: Richard Fitzgerald > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-core.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index f466f29..d18f3b1 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -813,7 +813,9 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) > int count = 0; > > pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0); > - if (pdata->reset < 0) { > + if (pdata->reset == -EPROBE_DEFER) { > + return pdata->reset; > + } else if (pdata->reset < 0) { > dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n", > pdata->reset); > > @@ -1011,11 +1013,14 @@ int arizona_dev_init(struct arizona *arizona) > dev_set_drvdata(arizona->dev, arizona); > mutex_init(&arizona->clk_lock); > > - if (dev_get_platdata(arizona->dev)) > + if (dev_get_platdata(arizona->dev)) { > memcpy(&arizona->pdata, dev_get_platdata(arizona->dev), > sizeof(arizona->pdata)); > - else > - arizona_of_get_core_pdata(arizona); > + } else { > + ret = arizona_of_get_core_pdata(arizona); > + if (ret < 0) > + return ret; > + } > > BUILD_BUG_ON(ARRAY_SIZE(arizona->mclk) != ARRAY_SIZE(mclk_name)); > for (i = 0; i < ARRAY_SIZE(arizona->mclk); i++) { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog