From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751944AbcFWQBN (ORCPT ); Thu, 23 Jun 2016 12:01:13 -0400 Received: from down.free-electrons.com ([37.187.137.238]:40849 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751522AbcFWQBL convert rfc822-to-8bit (ORCPT ); Thu, 23 Jun 2016 12:01:11 -0400 Date: Thu, 23 Jun 2016 18:01:08 +0200 From: Boris Brezillon To: Icenowy Zheng Cc: maxime.ripard@free-electrons.com, wens@csie.org, robh+dt@kernel.org, richard@nod.at, dwmw2@infradead.org, computersforpeace@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 2/2] mtd: nand: sunxi: add reset line support Message-ID: <20160623180108.382bbaae@bbrezillon> In-Reply-To: <20160620044838.56904-2-icenowy@aosc.xyz> References: <20160620044838.56904-1-icenowy@aosc.xyz> <20160620044838.56904-2-icenowy@aosc.xyz> Organization: Free Electrons X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 20 Jun 2016 12:48:38 +0800 Icenowy Zheng wrote: > The NAND controller on some sun8i chips needs its reset line to be > deasserted before they can enter working state. > > Signed-off-by: Icenowy Zheng > --- >  Changes in v2: >    - Corrected the error checking code of reset line. > >  Changes in v3: >    - Corrected a more serious error brought in the "fix" of v2. > >  Changes in v4: >    - Removed unneeded code block after "else". > >  Changes in v5: >    - Added reassertion code in case of initialization error and device >      remove. > > Changes in v6: > - Fixed a resource leak by not using goto to exit in case of error. > > drivers/mtd/nand/sunxi_nand.c | 28 +++++++++++++++++++++++++--- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c > index a83a690..08d5e88 100644 > --- a/drivers/mtd/nand/sunxi_nand.c > +++ b/drivers/mtd/nand/sunxi_nand.c > @@ -39,6 +39,7 @@ > #include > #include > #include > +#include > > #define NFC_REG_CTL 0x0000 > #define NFC_REG_ST 0x0004 > @@ -269,6 +270,7 @@ struct sunxi_nfc { > void __iomem *regs; > struct clk *ahb_clk; > struct clk *mod_clk; > + struct reset_control *reset; > unsigned long assigned_cs; > unsigned long clk_rate; > struct list_head chips; > @@ -1871,26 +1873,42 @@ static int sunxi_nfc_probe(struct platform_device *pdev) > if (ret) > goto out_ahb_clk_unprepare; > > + nfc->reset = devm_reset_control_get_optional(dev, "ahb"); > + > + if (!IS_ERR(nfc->reset)) { > + ret = reset_control_deassert(nfc->reset); > + if (ret) { > + dev_err(dev, "reset err %d\n", ret); > + goto out_mod_clk_unprepare; > + } > + } else if (PTR_ERR(nfc->reset) != -ENOENT) { > + ret = PTR_ERR(nfc->reset); You should return -EDEFER_PROBE here. And can you please rebase this series on top of nand/next [1]? [1]https://github.com/linux-nand/linux/tree/nand/next