mtd/drivers/mtd/nand Config.in,1.10,1.11 Kconfig,1.2,1.3 Makefile,1.9,1.10 nand.c,1.34,1.35

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv12959

Modified Files:
	Config.in Kconfig Makefile nand.c 
Log Message:
Split NAND_IDS in a seperate module so DOCxx and NAND can use it

Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Config.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Config.in	25 Nov 2002 20:56:23 -0000	1.10
+++ Config.in	1 Dec 2002 13:23:05 -0000	1.11
@@ -23,4 +23,14 @@
    dep_tristate '  NAND Flash device on EDP7312 board' CONFIG_MTD_NAND_EDB7312 $CONFIG_MTD_NAND
 fi
 
+if [ "$CONFIG_MTD_DOC2001" = "y" -o "$CONFIG_MTD_DOC2000" = "y" -o "$CONFIG_MTD_NAND" = "y" ]; then
+   define_bool CONFIG_MTD_NAND_IDS y
+fi
+
+if [ "$CONFIG_MTD_NAND_IDS" != "y" ]; then
+if [ "$CONFIG_MTD_DOC2001" = "m" -o "$CONFIG_MTD_DOC2000" = "m" -o "$CONFIG_MTD_NAND" = "m" ]; then
+   define_bool CONFIG_MTD_NAND_IDS m
+fi
+fi
+
 endmenu

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Kconfig	27 Nov 2002 00:16:32 -0000	1.2
+++ Kconfig	1 Dec 2002 13:23:05 -0000	1.3
@@ -42,5 +42,10 @@
 	help
 	  If you had to ask, you don't have one. Say 'N'.
 
+config MTD_NAND_IDS
+	tristate
+	default y if MTD_NAND = y || MTD_DOC2000 = y || MTD_DOC2001 = y
+	default m if MTD_NAND = m || MTD_DOC2000 = m || MTD_DOC2001 = m
+	
 endmenu
 

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	27 Nov 2002 10:27:05 -0000	1.9
+++ Makefile	1 Dec 2002 13:23:05 -0000	1.10
@@ -9,13 +9,15 @@
 O_TARGET			:= nandlink.o
 endif
 
-export-objs			:= nand.o nand_ecc.o
+export-objs			:= nand.o nand_ecc.o nand_ids.o
 
-nandobjs-y			:= nand.o nand_ecc.o
+nandobjs-y			:= nand.o
 
-obj-$(CONFIG_MTD_NAND)		+= $(nandobjs-y)
+obj-$(CONFIG_MTD_NAND)		+= $(nandobjs-y) 
+obj-$(CONFIG_MTD_NAND)		+= nand_ecc.o
 obj-$(CONFIG_MTD_NAND_SPIA)	+= spia.o
 obj-$(CONFIG_MTD_NAND_AUTCPU12)	+= autcpu12.o
 obj-$(CONFIG_MTD_NAND_EDB7312)  += edb7312.o
+obj-$(CONFIG_MTD_NAND_IDS)	+= nand_ids.o
 
 include $(TOPDIR)/Rules.make

Index: nand.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nand.c	25 Nov 2002 20:56:23 -0000	1.34
+++ nand.c	1 Dec 2002 13:23:05 -0000	1.35
@@ -151,39 +151,6 @@
 };
 
 /*
-*	Chip ID list
-*/
-static struct nand_flash_dev nand_flash_ids[] = {
-	{"NAND 1MB 5V", 0x6e, 20, 0x1000, 1},	// 1Mb 5V
-	{"NAND 2MB 5V", 0x64, 21, 0x1000, 1},	// 2Mb 5V
-	{"NAND 4MB 5V", 0x6b, 22, 0x2000, 0},	// 4Mb 5V
-	{"NAND 1MB 3,3V", 0xe8, 20, 0x1000, 1},	// 1Mb 3.3V
-	{"NAND 1MB 3,3V", 0xec, 20, 0x1000, 1},	// 1Mb 3.3V
-	{"NAND 2MB 3,3V", 0xea, 21, 0x1000, 1},	// 2Mb 3.3V
-	{"NAND 4MB 3,3V", 0xd5, 22, 0x2000, 0},	// 4Mb 3.3V
-	{"NAND 4MB 3,3V", 0xe3, 22, 0x2000, 0},	// 4Mb 3.3V
-	{"NAND 4MB 3,3V", 0xe5, 22, 0x2000, 0},	// 4Mb 3.3V
-	{"NAND 8MB 3,3V", 0xd6, 23, 0x2000, 0},	// 8Mb 3.3V
-	{"NAND 8MB 3,3V", 0xe6, 23, 0x2000, 0},	// 8Mb 3.3V
-	{"NAND 16MB 3,3V", 0x73, 24, 0x4000, 0},// 16Mb 3,3V
-	{"NAND 32MB 3,3V", 0x75, 25, 0x4000, 0}, // 32Mb 3,3V
-	{"NAND 64MB 3,3V", 0x76, 26, 0x4000, 0}, // 64Mb 3,3V
-	{"NAND 128MB 3,3V", 0x79, 27, 0x4000, 0}, // 128Mb 3,3V
-	{NULL,}
-};
-
-/*
-*	Manufacturer ID list
-*/
-static struct nand_manufacturers nand_manuf_ids[] = {
-	{NAND_MFR_TOSHIBA, "Toshiba"},
-	{NAND_MFR_SAMSUNG, "Samsung"},
-	{NAND_MFR_FUJITSU, "Fujitsu"},
-	{NAND_MFR_NATIONAL, "National"},
-	{0x0, "Unknown"}
-};
-
-/*
  * NAND low-level MTD interface functions
  */
 static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);