Commit 229204da authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Move AMD/Spansion specific init/detection logic in nand_amd.c 



Move AMD/Spansion specific initialization/detection logic into
nand_amd.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>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
parent 10d4e75c

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o 
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_micron.o

nand-objs += nand_samsung.o

drivers/mtd/nand/nand_amd.c

0 → 100644
+51 −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 void amd_nand_decode_id(struct nand_chip *chip)

{

	struct mtd_info *mtd = nand_to_mtd(chip);



	nand_decode_ext_id(chip);



	/*

	 * Check for Spansion/AMD ID + repeating 5th, 6th byte since

	 * some Spansion chips have erasesize that conflicts with size

	 * listed in nand_ids table.

	 * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39)

	 */

	if (chip->id.data[4] != 0x00 && chip->id.data[5] == 0x00 &&

	    chip->id.data[6] == 0x00 && chip->id.data[7] == 0x00 &&

	    mtd->writesize == 512) {

		mtd->erasesize = 128 * 1024;

		mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1);

	}

}



static int amd_nand_init(struct nand_chip *chip)

{

	if (nand_is_slc(chip))

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;



	return 0;

}



const struct nand_manufacturer_ops amd_nand_manuf_ops = {

	.detect = amd_nand_decode_id,

	.init = amd_nand_init,

};

drivers/mtd/nand/nand_base.c

+1 −17
Original line number Diff line number Diff line
@@ -3825,8 +3825,6 @@ EXPORT_SYMBOL_GPL(nand_decode_ext_id); 
static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	u8 *id_data = chip->id.data;

	int maf_id = id_data[0];



	mtd->erasesize = type->erasesize;

	mtd->writesize = type->pagesize;
@@ -3834,19 +3832,6 @@ static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) 


	/* All legacy ID NAND are small-page, SLC */

	chip->bits_per_cell = 1;



	/*

	 * Check for Spansion/AMD ID + repeating 5th, 6th byte since

	 * some Spansion chips have erasesize that conflicts with size

	 * listed in nand_ids table.

	 * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39)

	 */

	if (maf_id == NAND_MFR_AMD && id_data[4] != 0x00 && id_data[5] == 0x00

			&& id_data[6] == 0x00 && id_data[7] == 0x00

			&& mtd->writesize == 512) {

		mtd->erasesize = 128 * 1024;

		mtd->erasesize <<= ((id_data[3] & 0x03) << 1);

	}

}



/*
@@ -3872,8 +3857,7 @@ static void nand_decode_bbm_options(struct nand_chip *chip) 
	 * 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_AMD || maf_id == NAND_MFR_MACRONIX))

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

		chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;

}

drivers/mtd/nand/nand_ids.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static const struct nand_manufacturer nand_manufacturers[] = { 
	{NAND_MFR_STMICRO, "ST Micro"},

	{NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},

	{NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},

	{NAND_MFR_AMD, "AMD/Spansion"},

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

	{NAND_MFR_MACRONIX, "Macronix"},

	{NAND_MFR_EON, "Eon"},

	{NAND_MFR_SANDISK, "SanDisk"},

include/linux/mtd/nand.h

+1 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,7 @@ extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops; 
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;



int nand_default_bbt(struct mtd_info *mtd);

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