From patchwork Fri Jul 20 15:15:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10537917 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 D3C79602CA for ; Fri, 20 Jul 2018 15:48:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA59A28FF8 for ; Fri, 20 Jul 2018 15:48:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE6A12981E; Fri, 20 Jul 2018 15:48:04 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 827D228FF8 for ; Fri, 20 Jul 2018 15:48:04 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8aA6oNc+SwH1y1OhmoqT/x4QdTsj1D6q9AMnKvK/Yn4=; b=oiXCFZUDKLZlgPxJjipCUy0dAv lrTjyaMV3eM0HsaTuLxcRSqRuG09HiPV2nKfQfV2q3uTQk5pkLavKKjpfcraGxH/00cpu/9tTkb4W ZUffTyM+ZndQt/2UWMOIWA3PVwvA+iUbabYVHCJ/lpL3JhtOm52RgGJeTX9ccDgEnFWGQZt+ic+zq k+lufCQ86ZigTZXJrTVqRGSCem9u8LAQZnt9+7XY9E5vmgYq0mt/jK6khO2XFATpUNvpkua+ojrPE nmdPMHJu02mdVACpqzC/2xpXl+yNONMu3s7jkXRy8ywN7q0rGl8F1tJggC5fRDgti6KW49DsvGIug 6GHc4yuw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fgXdT-0003Fj-CI for patchwork-linux-mediatek@patchwork.kernel.org; Fri, 20 Jul 2018 15:48:03 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fgXbu-0006d6-Tz; Fri, 20 Jul 2018 15:46:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=SeCVuZikHwXueeMF5kD4aw5Pzd/qsf/Qy78sP5K/7DY=; b=Xd29peZLUl+nbudo2TAybgKMM MK2mpOU/6H38Q0rKA3fbnKPUQRQdr9oWlxzJHKtFThv4l3N0XlnjHMnc+2Bfjq6wZl3DeIu/v/3BL wHxcoVEk47vI+neRyveljuUl8y7rUjqKfiUyKOvEiimoJTIEiLcZnS4KuFsnwbUiH6iVAVf7BCtGb HyFcqTVCwL+Uspywfv9ldAoqPVOudEQC6hFccX6RS2m4BPjcQdF46E2M0yLRnvOPEZq/nrNLq7314 94LVnLuoRMpAeU3Bc9CmI7thhx7MZg/64M/2uv7J4ECtGKCrUyJsv8Rw6fmp51++wxwtWI9eZr4s6 lTikIxcsg==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fgX8c-0007gW-Lp; Fri, 20 Jul 2018 15:16:14 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id CDD07209BD; Fri, 20 Jul 2018 17:16:01 +0200 (CEST) Received: from localhost.localdomain (AAubervilliers-681-1-78-122.w90-88.abo.wanadoo.fr [90.88.20.122]) by mail.bootlin.com (Postfix) with ESMTPSA id 596C3209C2; Fri, 20 Jul 2018 17:15:46 +0200 (CEST) From: Miquel Raynal To: Wenyou Yang , Josh Wu , Tudor Ambarus , Boris Brezillon , Miquel Raynal , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Nicolas Ferre , Alexandre Belloni , Kamal Dasu , Masahiro Yamada , Han Xu , Harvey Hunt , Vladimir Zapolskiy , Sylvain Lemieux , Xiaolei Li , Matthias Brugger , Maxime Ripard , Chen-Yu Tsai , Marc Gonzalez , Mans Rullgard , Stefan Agner Subject: [PATCH v4 31/35] mtd: rawnand: jz4740: convert driver to nand_scan() Date: Fri, 20 Jul 2018 17:15:23 +0200 Message-Id: <20180720151527.16038-32-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180720151527.16038-1-miquel.raynal@bootlin.com> References: <20180720151527.16038-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180720_161610_752157_DC3650ED X-CRM114-Status: GOOD ( 21.92 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-mediatek@lists.infradead.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Two helpers have been added to the core to make ECC-related configuration between the detection phase and the final NAND scan. Use these hooks and convert the driver to just use nand_scan() instead of both nand_scan_ident() and nand_scan_tail(). Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/jz4740_nand.c | 46 ++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c index 9bb8a89e09f9..8f821fdf8a1c 100644 --- a/drivers/mtd/nand/raw/jz4740_nand.c +++ b/drivers/mtd/nand/raw/jz4740_nand.c @@ -59,6 +59,7 @@ struct jz_nand { struct nand_chip chip; + struct platform_device *pdev; void __iomem *base; struct resource *mem; @@ -329,8 +330,8 @@ static int jz_nand_detect_bank(struct platform_device *pdev, writel(ctrl, nand->base + JZ_REG_NAND_CTRL); if (chipnr == 0) { - /* Detect first chip. */ - ret = nand_scan_ident(mtd, 1, NULL); + /* Detect the first chip and register it */ + ret = nand_scan(mtd, 1); if (ret) goto notfound_id; @@ -367,6 +368,25 @@ static int jz_nand_detect_bank(struct platform_device *pdev, return ret; } +static int jz_nand_attach_chip(struct nand_chip *chip) +{ + struct mtd_info *mtd = nand_to_mtd(chip); + struct jz_nand *nand = mtd_to_jz_nand(mtd); + struct device *dev = mtd->dev.parent; + struct jz_nand_platform_data *pdata = dev_get_platdata(dev); + + if (pdata && pdata->ident_callback) { + pdata->ident_callback(nand->pdev, mtd, &pdata->partitions, + &pdata->num_partitions); + } + + return 0; +} + +static const struct nand_controller_ops jz_nand_controller_ops = { + .attach_chip = jz_nand_attach_chip, +}; + static int jz_nand_probe(struct platform_device *pdev) { int ret; @@ -397,6 +417,7 @@ static int jz_nand_probe(struct platform_device *pdev) mtd = nand_to_mtd(chip); mtd->dev.parent = &pdev->dev; mtd->name = "jz4740-nand"; + nand->pdev = pdev; chip->ecc.hwctl = jz_nand_hwctl; chip->ecc.calculate = jz_nand_calculate_ecc_rs; @@ -410,6 +431,7 @@ static int jz_nand_probe(struct platform_device *pdev) chip->chip_delay = 50; chip->cmd_ctrl = jz_nand_cmd_ctrl; chip->select_chip = jz_nand_select_chip; + chip->dummy_controller.ops = &jz_nand_controller_ops; if (nand->busy_gpio) chip->dev_ready = jz_nand_dev_ready; @@ -450,20 +472,10 @@ static int jz_nand_probe(struct platform_device *pdev) else nand->banks[chipnr] = 0; } + if (chipnr == 0) { dev_err(&pdev->dev, "No NAND chips found\n"); - goto err_iounmap_mmio; - } - - if (pdata && pdata->ident_callback) { - pdata->ident_callback(pdev, mtd, &pdata->partitions, - &pdata->num_partitions); - } - - ret = nand_scan_tail(mtd); - if (ret) { - dev_err(&pdev->dev, "Failed to scan NAND\n"); - goto err_unclaim_banks; + goto err_nand_release; } ret = mtd_device_register(mtd, pdata ? pdata->partitions : NULL, @@ -471,15 +483,13 @@ static int jz_nand_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to add mtd device\n"); - goto err_nand_release; + goto err_unclaim_banks; } dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n"); return 0; -err_nand_release: - nand_release(mtd); err_unclaim_banks: while (chipnr--) { unsigned char bank = nand->banks[chipnr]; @@ -487,6 +497,8 @@ static int jz_nand_probe(struct platform_device *pdev) nand->bank_base[bank - 1]); } writel(0, nand->base + JZ_REG_NAND_CTRL); +err_nand_release: + nand_release(mtd); err_iounmap_mmio: jz_nand_iounmap_resource(nand->mem, nand->base); err_free: