Commit 3b5206f4 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Move Macronix specific initialization in nand_macronix.c 



Move Macronix specific initialization logic into nand_macronix.c. This
is part of the "separate vendor specific code from core" cleanup
process.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 229204da

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ obj-$(CONFIG_MTD_NAND_MTK) += mtk_nand.o mtk_ecc.o 
nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o

nand-objs += nand_amd.o

nand-objs += nand_hynix.o

nand-objs += nand_macronix.o

nand-objs += nand_micron.o

nand-objs += nand_samsung.o

nand-objs += nand_toshiba.o

drivers/mtd/nand/nand_base.c

+0 −11
Original line number Diff line number Diff line
@@ -3842,23 +3842,12 @@ static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) 
static void nand_decode_bbm_options(struct nand_chip *chip)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	u8 *id_data = chip->id.data;

	int maf_id = id_data[0];



	/* Set the bad block position */

	if (mtd->writesize > 512 || (chip->options & NAND_BUSWIDTH_16))

		chip->badblockpos = NAND_LARGE_BADBLOCK_POS;

	else

		chip->badblockpos = NAND_SMALL_BADBLOCK_POS;



	/*

	 * Bad block marker is stored in the last page of each block on Samsung

	 * and Hynix MLC devices; stored in first two pages of each block on

	 * Micron devices with 2KiB pages and on SLC Samsung, Hynix, Toshiba,

	 * AMD/Spansion, and Macronix.  All others scan only the first page.

	 */

	if (nand_is_slc(chip) && maf_id == NAND_MFR_MACRONIX)

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;

}



static inline bool is_full_id_nand(struct nand_flash_dev *type)

drivers/mtd/nand/nand_ids.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static const struct nand_manufacturer nand_manufacturers[] = { 
	{NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},

	{NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},

	{NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},

	{NAND_MFR_MACRONIX, "Macronix"},

	{NAND_MFR_MACRONIX, "Macronix", &macronix_nand_manuf_ops},

	{NAND_MFR_EON, "Eon"},

	{NAND_MFR_SANDISK, "SanDisk"},

	{NAND_MFR_INTEL, "Intel"},

drivers/mtd/nand/nand_macronix.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Free Electrons

 * Copyright (C) 2017 NextThing Co

 *

 * Author: Boris Brezillon <boris.brezillon@free-electrons.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/mtd/nand.h>



static int macronix_nand_init(struct nand_chip *chip)

{

	if (nand_is_slc(chip))

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;



	return 0;

}



const struct nand_manufacturer_ops macronix_nand_manuf_ops = {

	.init = macronix_nand_init,

};

include/linux/mtd/nand.h

+1 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,7 @@ extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; 
extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;

extern const struct nand_manufacturer_ops micron_nand_manuf_ops;

extern const struct nand_manufacturer_ops amd_nand_manuf_ops;

extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;



int nand_default_bbt(struct mtd_info *mtd);

int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);