From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FB2CC43144 for ; Fri, 22 Jun 2018 16:55:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E61B224624 for ; Fri, 22 Jun 2018 16:55:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E61B224624 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933846AbeFVQzL (ORCPT ); Fri, 22 Jun 2018 12:55:11 -0400 Received: from mail.bootlin.com ([62.4.15.54]:33653 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933549AbeFVQzJ (ORCPT ); Fri, 22 Jun 2018 12:55:09 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 9E38220DCD; Fri, 22 Jun 2018 18:55:07 +0200 (CEST) Received: from bbrezillon (91-160-177-164.subs.proxad.net [91.160.177.164]) by mail.bootlin.com (Postfix) with ESMTPSA id 4C50720734; Fri, 22 Jun 2018 18:54:57 +0200 (CEST) Date: Fri, 22 Jun 2018 18:54:56 +0200 From: Boris Brezillon To: Masahiro Yamada Cc: linux-mtd@lists.infradead.org, Rob Herring , Miquel Raynal , Richard Weinberger , linux-kernel@vger.kernel.org, Marek Vasut , Brian Norris , David Woodhouse Subject: Re: [PATCH v4 4/5] mtd: rawnand: denali_dt: add more clocks based on IP datasheet Message-ID: <20180622185456.20f84264@bbrezillon> In-Reply-To: <1529683598-25783-5-git-send-email-yamada.masahiro@socionext.com> References: <1529683598-25783-1-git-send-email-yamada.masahiro@socionext.com> <1529683598-25783-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 23 Jun 2018 01:06:37 +0900 Masahiro Yamada wrote: > Currently, denali_dt.c requires a single anonymous clock, but > the Denali User's Guide requires three clocks for this IP: > > - clk: controller core clock > > - clk_x: bus interface clock > > - ecc_clk: clock at which ECC circuitry is run > > This commit supports these named clocks to represent the real hardware. > > For the backward compatibility, the driver still accepts a single clock > just as before. The clk_x_rate is taken from the clock driver again if > the named clock "clk_x" is available. This will happen only for future > DT, hence the existing DT files are not affected. > > Signed-off-by: Masahiro Yamada > Reviewed-by: Miquel Raynal > Reviewed-by: Richard Weinberger > Tested-by: Richard Weinberger > --- > > Changes in v4: None > Changes in v3: > - Change the patch order so that the bug-fix one comes the first > > Changes in v2: > - Split patches into sensible chunks > > drivers/mtd/nand/raw/denali_dt.c | 53 ++++++++++++++++++++++++++++++++++------ > 1 file changed, 45 insertions(+), 8 deletions(-) > > diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c > index 6b4bd16..afaae37 100644 > --- a/drivers/mtd/nand/raw/denali_dt.c > +++ b/drivers/mtd/nand/raw/denali_dt.c > @@ -27,7 +27,9 @@ > > struct denali_dt { > struct denali_nand_info denali; > - struct clk *clk; > + struct clk *clk; /* core clock */ > + struct clk *clk_x; /* bus interface clock */ > + struct clk *clk_ecc; /* ECC circuit clock */ Probably better to use a kernel-doc header to document those fields. Anyway, Reviewed-by: Boris Brezillon > }; > > struct denali_dt_data { > @@ -115,28 +117,61 @@ static int denali_dt_probe(struct platform_device *pdev) > if (IS_ERR(denali->host)) > return PTR_ERR(denali->host); > > - dt->clk = devm_clk_get(dev, NULL); > + /* > + * A single anonymous clock is supported for the backward compatibility. > + * New platforms should support all the named clocks. > + */ > + dt->clk = devm_clk_get(dev, "nand"); > + if (IS_ERR(dt->clk)) > + dt->clk = devm_clk_get(dev, NULL); > if (IS_ERR(dt->clk)) { > dev_err(dev, "no clk available\n"); > return PTR_ERR(dt->clk); > } > + > + dt->clk_x = devm_clk_get(dev, "nand_x"); > + if (IS_ERR(dt->clk_x)) > + dt->clk_x = NULL; > + > + dt->clk_ecc = devm_clk_get(dev, "ecc"); > + if (IS_ERR(dt->clk_ecc)) > + dt->clk_ecc = NULL; > + > ret = clk_prepare_enable(dt->clk); > if (ret) > return ret; > > - /* > - * Hardcode the clock rate for the backward compatibility. > - * This works for both SOCFPGA and UniPhier. > - */ > - denali->clk_x_rate = 200000000; > + ret = clk_prepare_enable(dt->clk_x); > + if (ret) > + goto out_disable_clk; > + > + ret = clk_prepare_enable(dt->clk_ecc); > + if (ret) > + goto out_disable_clk_x; > + > + if (dt->clk_x) { > + denali->clk_x_rate = clk_get_rate(dt->clk_x); > + } else { > + /* > + * Hardcode the clock rates for the backward compatibility. > + * This works for both SOCFPGA and UniPhier. > + */ > + dev_notice(dev, > + "necessary clock is missing. default clock rates are used.\n"); > + denali->clk_x_rate = 200000000; > + } > > ret = denali_init(denali); > if (ret) > - goto out_disable_clk; > + goto out_disable_clk_ecc; > > platform_set_drvdata(pdev, dt); > return 0; > > +out_disable_clk_ecc: > + clk_disable_unprepare(dt->clk_ecc); > +out_disable_clk_x: > + clk_disable_unprepare(dt->clk_x); > out_disable_clk: > clk_disable_unprepare(dt->clk); > > @@ -148,6 +183,8 @@ static int denali_dt_remove(struct platform_device *pdev) > struct denali_dt *dt = platform_get_drvdata(pdev); > > denali_remove(&dt->denali); > + clk_disable_unprepare(dt->clk_ecc); > + clk_disable_unprepare(dt->clk_x); > clk_disable_unprepare(dt->clk); > > return 0;