Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cf9827b authored by Thomas Gleixner's avatar Thomas Gleixner Committed by David Woodhouse
Browse files

[MTD] [NAND] Move ancient NAND chip support into a config option 



The support for obsolete ancient NAND chips adds .data size and one
of the old ids conflicts with a modern one. Make the support for
such chips depending on a config option.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 90424de8

drivers/mtd/nand/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,15 @@ config MTD_NAND_ECC_SMC 
	  Software ECC according to the Smart Media Specification.

	  Software ECC according to the Smart Media Specification.

	  The original Linux implementation had byte 0 and 1 swapped.

	  The original Linux implementation had byte 0 and 1 swapped.





config MTD_NAND_MUSEUM_IDS

	bool "Enable chip ids for obsolete ancient NAND devices"

	depends on MTD_NAND

	default n

	help

	  Enable this option only when your board has first generation

	  NAND chips (page size 256 byte, erase size 4-8KiB). The IDs

	  of these chips were reused by later, larger chips.



config MTD_NAND_AUTCPU12

config MTD_NAND_AUTCPU12

	tristate "SmartMediaCard on autronix autcpu12 board"

	tristate "SmartMediaCard on autronix autcpu12 board"

	depends on MTD_NAND && ARCH_AUTCPU12

	depends on MTD_NAND && ARCH_AUTCPU12

drivers/mtd/nand/nand_ids.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ 
*	512	512 Byte page size

*	512	512 Byte page size

*/

*/

struct nand_flash_dev nand_flash_ids[] = {

struct nand_flash_dev nand_flash_ids[] = {



#ifdef CONFIG_MTD_NAND_MUSEUM_IDS

	{"NAND 1MiB 5V 8-bit",		0x6e, 256, 1, 0x1000, 0},

	{"NAND 1MiB 5V 8-bit",		0x6e, 256, 1, 0x1000, 0},

	{"NAND 2MiB 5V 8-bit",		0x64, 256, 2, 0x1000, 0},

	{"NAND 2MiB 5V 8-bit",		0x64, 256, 2, 0x1000, 0},

	{"NAND 4MiB 5V 8-bit",		0x6b, 512, 4, 0x2000, 0},

	{"NAND 4MiB 5V 8-bit",		0x6b, 512, 4, 0x2000, 0},
@@ -39,6 +41,7 @@ struct nand_flash_dev nand_flash_ids[] = { 
	{"NAND 8MiB 3,3V 8-bit",	0xe6, 512, 8, 0x2000, 0},

	{"NAND 8MiB 3,3V 8-bit",	0xe6, 512, 8, 0x2000, 0},

	{"NAND 8MiB 1,8V 16-bit",	0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},

	{"NAND 8MiB 1,8V 16-bit",	0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},

	{"NAND 8MiB 3,3V 16-bit",	0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},

	{"NAND 8MiB 3,3V 16-bit",	0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},

#endif





	{"NAND 16MiB 1,8V 8-bit",	0x33, 512, 16, 0x4000, 0},

	{"NAND 16MiB 1,8V 8-bit",	0x33, 512, 16, 0x4000, 0},

	{"NAND 16MiB 3,3V 8-bit",	0x73, 512, 16, 0x4000, 0},

	{"NAND 16MiB 3,3V 8-bit",	0x73, 512, 16, 0x4000, 0},