From patchwork Fri Mar 2 17:03:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255385 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 271266037F for ; Fri, 2 Mar 2018 18:28:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16A8527FA9 for ; Fri, 2 Mar 2018 18:28:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B6CB27FE4; Fri, 2 Mar 2018 18:28:51 +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 [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 4986227FC0 for ; Fri, 2 Mar 2018 18:28:50 +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=zg8pdK5oC6VBCtpOfCGlIIPhV9orTNAzHyt9sEI+BsY=; b=c1Qt1/ffQ1RXR5xD8jY9j+SVRZ TQqQSptit1pipdqObUUiONb+Quq9logmt985vbnn+3oAiPg7x+deW91Xdl1lTnkPMhcE2KRiqYuPL +7ok0Em+9VL5zO9M9SB4alRm/SZKlGTgkA+00+gNlOU4agFuTUkEVNFwymKbWsR9LbsCg3jsRxjoR /hhwf7qFkKHgC8OzP2voxlF7ucMC+12B5U9q46waJmBBpzMpoProN/dbujJhbGfkjvJCv6l378HQr llJkwZV25o6hWvWH+Z/Um+jBI7Qx5Xn3IILt00U1fzxYduluF/OX4jDC+UfjBDQCJzK3/18mioZGU AxXzm+8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erpQ7-0006sZ-6p; Fri, 02 Mar 2018 18:28:39 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erpBs-0001qC-Ct; Fri, 02 Mar 2018 18:13:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=Sl6yPdhiyIyNP4CiiuvUWrJYJs6xdNBnn+lnAw8Xk6o=; b=d0N53XK3EGxI5fG6UilX7Y8Gl 2ZnG/yu/VneabAcJhl9HF4tHIVY4DQ3Zve4s7sGUA5drgsIHz6KUY58vB6movuWgs9xqBd3DgmwCX Jai+H5PW+anumJtGkatrKiDkMYKaH13FCB+yld0wu8rFsyiKLtSjCTAf2HJQXTsQCyBk5DSDGsDtf bTw7UKk/WwGjRDNMvaIXToWA9LeTQUIP/duOU48FTd3ZkRZqNvgYIGEXymjrzntHg30O/6tU5VElj FI0STv+3kB6swh5VmrtCVyQcJ+wt7hnUnP8kyA4S77drSOglc31jG/G0hKiyQPLxTdqZg8y0MWLFG fK1Lmxb8w==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7C-00075U-7p; Fri, 02 Mar 2018 17:05:08 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 2F8CE209F9; Fri, 2 Mar 2018 18:04:42 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 4944420974; Fri, 2 Mar 2018 18:04:41 +0100 (CET) From: Miquel Raynal To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Josh Wu , Kamal Dasu , Harvey Hunt , Stefan Agner Subject: [PATCH 44/52] mtd: rawnand: add a field in nand_chip to fill an array of IDs Date: Fri, 2 Mar 2018 18:03:52 +0100 Message-Id: <20180302170400.6712-45-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180302170400.6712-1-miquel.raynal@bootlin.com> References: <20180302170400.6712-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180302_120502_593194_8191D0A6 X-CRM114-Status: GOOD ( 15.71 ) 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: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal MIME-Version: 1.0 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 Add an alternate way to give to the core another ID table to later remove the one given in nand_scan_ident() as part of the migration to nand_scan(). Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/nand_base.c | 8 ++++++-- include/linux/mtd/rawnand.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 182904b2fc07..0d850dbf843d 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5594,8 +5594,12 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type) manufacturer = nand_get_manufacturer(maf_id); chip->manufacturer.desc = manufacturer; - if (!type) - type = nand_flash_ids; + if (!type) { + if (chip->flash_ids) + type = chip->flash_ids; + else + type = nand_flash_ids; + } /* * Save the NAND_BUSWIDTH_16 flag before letting auto-detection logic diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 53bb6ef1a7c2..318c73a206fc 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1201,6 +1201,7 @@ int nand_op_parser_exec_op(struct nand_chip *chip, * chipnr is set to %NAND_DATA_IFACE_CHECK_ONLY this * means the configuration should not be applied but * only checked. + * @flash_ids: [OPTIONAL] local NAND flash ID table * @bbt: [INTERN] bad block table pointer * @bbt_td: [REPLACEABLE] bad block table descriptor for flash * lookup. @@ -1287,6 +1288,8 @@ struct nand_chip { unsigned long buf_align; struct nand_hw_control hwcontrol; + struct nand_flash_dev *flash_ids; + uint8_t *bbt; struct nand_bbt_descr *bbt_td; struct nand_bbt_descr *bbt_md;