From patchwork Mon Jun 20 13:50:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 637973 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rYC2x59V5z9sCy for ; Mon, 20 Jun 2016 23:52:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bEzbF-0006Ml-NH; Mon, 20 Jun 2016 13:50:49 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bEzbD-0006HX-EM for linux-mtd@lists.infradead.org; Mon, 20 Jun 2016 13:50:47 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 13E292C6; Mon, 20 Jun 2016 15:50:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from bbrezillon.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id C166A34C; Mon, 20 Jun 2016 15:50:26 +0200 (CEST) From: Boris Brezillon To: David Woodhouse , Brian Norris , linux-mtd@lists.infradead.org, Boris Brezillon , Richard Weinberger , "George Spelvin" Subject: [PATCH v2 3/3] mtd: nand: add a pairing field to nand_flash_dev Date: Mon, 20 Jun 2016 15:50:18 +0200 Message-Id: <1466430618-9713-4-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466430618-9713-1-git-send-email-boris.brezillon@free-electrons.com> References: <1466430618-9713-1-git-send-email-boris.brezillon@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160620_065047_656903_22F48877 X-CRM114-Status: GOOD ( 12.97 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [37.187.137.238 listed in list.dnswl.org] 1.0 FSL_HELO_HOME No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add a new field to attach a pairing scheme to a NAND chip definition and assign it to mtd->pairing when a full-id match is detected. Signed-off-by: Boris Brezillon --- drivers/mtd/nand/nand_base.c | 1 + include/linux/mtd/nand.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index dc30e3c5c032..920b0b31ff71 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3791,6 +3791,7 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, mtd->writesize = type->pagesize; mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; + mtd_set_pairing_scheme(mtd, type->pairing); chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); chip->chipsize = (uint64_t)type->chipsize << 20; diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 874b2671af90..685b26efcf82 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -855,6 +855,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) * @onfi_timing_mode_default: the default ONFI timing mode entered after a NAND * reset. Should be deduced from timings described * in the datasheet. + * @pairing: The page pairing scheme used by this NAND, if any. * */ struct nand_flash_dev { @@ -877,6 +878,7 @@ struct nand_flash_dev { uint16_t step_ds; } ecc; int onfi_timing_mode_default; + const struct mtd_pairing_scheme *pairing; }; /**