From patchwork Fri Apr 21 16:19:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 9693129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5A82E6038D for ; Fri, 21 Apr 2017 16:20:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4934126E78 for ; Fri, 21 Apr 2017 16:20:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A3C728630; Fri, 21 Apr 2017 16:20:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 40C8126E78 for ; Fri, 21 Apr 2017 16:20:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To: Subject:To:From:Date:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Hb/V1qX1hRHOIHn7oYEYt3YfG8gQ8oLJ/ha0r09qIzQ=; b=ulg1cY8+fEYSI0 +PXkcQCidLkQCZTxQtLI+vDaBTqTrecE40bFrhNRVHcv6c9dVasr4wkdLYcLPeXuzAm9oGz8RPmSp dRS+/nZjwifwuAUuOrYY5Or1FmRCPFrViqmBGkVb9OmXRotjT5u9n1OPadCdOIZQHT2o5rdFHRWjV PCR/ZxVjnrp3veehnj7GVYrak4ODxGO1Pc+5ycEycVbzpDCN89hL+c7VXuaMNInghxHsTKi8hsAcl BT+i/j+kzd1YiEBekdbjLWopQKhGsrWsaU2a+NTlSxH8bN5t3FXUKRBtXdPTMpuq7eBi79+kDPRkw y2SwWPaO+MznA7aGRJQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1bIP-0001b0-GG; Fri, 21 Apr 2017 16:20:33 +0000 Received: from mail.kmu-office.ch ([2a02:418:6a02::a2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d1bIL-0001Hr-IW; Fri, 21 Apr 2017 16:20:31 +0000 Received: from webmail.kmu-office.ch (unknown [178.209.48.103]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 41EB95C0B36; Fri, 21 Apr 2017 18:19:54 +0200 (CEST) MIME-Version: 1.0 Date: Fri, 21 Apr 2017 09:19:56 -0700 From: Stefan Agner To: Marek Vasut Subject: Re: [PATCH 2/5] mtd: nand: gpmi: add i.MX 7 SoC support In-Reply-To: <8377dadc-043f-5932-cb13-3367db38a6dd@gmail.com> References: <20170421010755.18025-1-stefan@agner.ch> <20170421010755.18025-3-stefan@agner.ch> <5cf26d2b020392c875464c7504a9fb5b@agner.ch> <8377dadc-043f-5932-cb13-3367db38a6dd@gmail.com> Message-ID: <494a7bc044457240a302d92b3a50b8e5@agner.ch> X-Sender: stefan@agner.ch User-Agent: Roundcube Webmail/1.1.3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1492791594; bh=kjJzU9/qvy1ysV3kO1ZPMuuZekM9YGskyAELBx9LMvA=; h=MIME-Version:Content-Type:Content-Transfer-Encoding:Date:From:To:Cc:Subject:In-Reply-To:References:Message-ID; b=S3q3ZBTfwJR1m45eEmQ9B5ISb5Og+RM/5iPZ/HFF0smnL8iXFiKd/jCZ1kMC8kY2jYkmZqN8X8wL6jvpBtyrLNJpoJXkQPVD6DcoHZB9AxFeHN8pKxzrxmNaqqRBKKSNFP7XSzNsc3xPLd3R2jp3Rin/w+iTXOLEBXTNtOK9YHg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170421_092029_971305_B847E8F9 X-CRM114-Status: GOOD ( 16.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, boris.brezillon@free-electrons.com, fabio.estevam@freescale.com, devicetree@vger.kernel.org, richard@nod.at, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-mtd@lists.infradead.org, kernel@pengutronix.de, han.xu@nxp.com, shawnguo@kernel.org, cyrille.pitchen@atmel.com, computersforpeace@gmail.com, dwmw2@infradead.org, linux-arm-kernel@lists.infradead.org, LW@karo-electronics.de Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On 2017-04-21 06:08, Marek Vasut wrote: > On 04/21/2017 05:15 AM, Stefan Agner wrote: >> On 2017-04-20 19:03, Marek Vasut wrote: >>> On 04/21/2017 03:07 AM, Stefan Agner wrote: >>>> Add support for i.MX 7 SoC. The i.MX 7 has a slightly different >>>> clock architecture requiring only two clocks to be referenced. >>>> The IP is slightly different compared to i.MX 6SoloX, but currently >>>> none of this differences are in use so there is no detection needed >>>> and the driver can reuse IS_MX6SX. >>>> >>>> Signed-off-by: Stefan Agner >>>> --- >>>> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 15 +++++++++++++++ >>>> 1 file changed, 15 insertions(+) >>>> >>>> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c >>>> index c8bbf5da2ab8..4a45d37ddc80 100644 >>>> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c >>>> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c >>>> @@ -127,6 +127,18 @@ static const struct gpmi_devdata gpmi_devdata_imx6sx = { >>>> .clks_count = ARRAY_SIZE(gpmi_clks_for_mx6), >>>> }; >>>> >>>> +static const char * const gpmi_clks_for_mx7d[] = { >>>> + "gpmi_io", "gpmi_bch_apb", >>>> +}; >>>> + >>>> +static const struct gpmi_devdata gpmi_devdata_imx7d = { >>>> + .type = IS_MX6SX, >>> >>> Would it make sense to use IS_MX7 here already to prevent future surprises ? >>> >> >> Yeah I was thinking we can do it once we have an actual reason to >> distinguish. > > So what are the differences anyway ? > I did not check the details, but Han's patchset (link in cover letter) mentions: "add the HW bitflip detection and correction for i.MX6QP and i.MX7D."... >> But then, adding the type would only require 2-3 lines of change if I >> add it to the GPMI_IS_MX6 macro... > > Then at least add a comment because using type = IMX6SX right under > gpmi_data_mx7d can trigger some head-scratching. And put my R-B on V2. FWIW, I mentioned it in the commit message. I think rather then adding a comment it is cleaner to just add IS_IMX7D and add it to the GPMI_IS_MX6 macro. That does not need a comment since it implicitly says we have a i.MX 7 but treat it like i.MX 6 and it is a rather small change. Does that sound acceptable? #endif --- Stefan --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -132,7 +132,7 @@ static const char * const gpmi_clks_for_mx7d[] = { }; static const struct gpmi_devdata gpmi_devdata_imx7d = { - .type = IS_MX6SX, + .type = IS_MX7D, .bch_max_ecc_strength = 62, .max_chain_delay = 12, .clks = gpmi_clks_for_mx7d, diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index 2e584e18d980..f2cc13abc896 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -123,7 +123,8 @@ enum gpmi_type { IS_MX23, IS_MX28, IS_MX6Q, - IS_MX6SX + IS_MX6SX, + IS_MX7D, }; struct gpmi_devdata { @@ -307,6 +308,8 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off, #define GPMI_IS_MX28(x) ((x)->devdata->type == IS_MX28) #define GPMI_IS_MX6Q(x) ((x)->devdata->type == IS_MX6Q) #define GPMI_IS_MX6SX(x) ((x)->devdata->type == IS_MX6SX) +#define GPMI_IS_MX7D(x) ((x)->devdata->type == IS_MX7D) -#define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x)) +#define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x) || \ + GPMI_IS_MX7D(x))