aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-05-31 19:31:26 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:01:56 -0400
commitb4dc53e16ff00c0edba3d3219e216475e68951b3 (patch)
treec6e3b0f1481097dce8d5b9533895401d502d1c6e
parent53d5d8885089b8abeb487392311ed18f897deb93 (diff)
mtd: nand: renumber the reorganized flags in nand.h / bbm.h
After several steps of rearrangement and consolidation, it is probably worth re-sequencing the numbers on some of our affected flags in nand.h and bbm.h. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--include/linux/mtd/bbm.h23
-rw-r--r--include/linux/mtd/nand.h6
2 files changed, 15 insertions, 14 deletions
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index 0fa030ae29d6..57d6a8d4aa17 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -92,28 +92,29 @@ struct nand_bbt_descr {
92 * layout or if this information is already purged. Must be used in conjunction 92 * layout or if this information is already purged. Must be used in conjunction
93 * with NAND_BBT_CREATE. 93 * with NAND_BBT_CREATE.
94 */ 94 */
95#define NAND_BBT_CREATE_EMPTY 0x01000000 95#define NAND_BBT_CREATE_EMPTY 0x00000400
96/* Search good / bad pattern through all pages of a block */ 96/* Search good / bad pattern through all pages of a block */
97#define NAND_BBT_SCANALLPAGES 0x00000400 97#define NAND_BBT_SCANALLPAGES 0x00000800
98/* Scan block empty during good / bad block scan */ 98/* Scan block empty during good / bad block scan */
99#define NAND_BBT_SCANEMPTY 0x00000800 99#define NAND_BBT_SCANEMPTY 0x00001000
100/* Write bbt if neccecary */ 100/* Write bbt if neccecary */
101#define NAND_BBT_WRITE 0x00001000 101#define NAND_BBT_WRITE 0x00002000
102/* Read and write back block contents when writing bbt */ 102/* Read and write back block contents when writing bbt */
103#define NAND_BBT_SAVECONTENT 0x00002000 103#define NAND_BBT_SAVECONTENT 0x00004000
104/* Search good / bad pattern on the first and the second page */ 104/* Search good / bad pattern on the first and the second page */
105#define NAND_BBT_SCAN2NDPAGE 0x00004000 105#define NAND_BBT_SCAN2NDPAGE 0x00008000
106/* Search good / bad pattern on the last page of the eraseblock */ 106/* Search good / bad pattern on the last page of the eraseblock */
107#define NAND_BBT_SCANLASTPAGE 0x00008000 107#define NAND_BBT_SCANLASTPAGE 0x00010000
108/* The nand_bbt_descr was created dynamicaly and must be freed */
109#define NAND_BBT_DYNAMICSTRUCT 0x00200000
110/* 108/*
111 * Use a flash based bad block table. By default, OOB identifier is saved in 109 * Use a flash based bad block table. By default, OOB identifier is saved in
112 * OOB area. This option is passed to the default bad block table function. 110 * OOB area. This option is passed to the default bad block table function.
113 */ 111 */
114#define NAND_BBT_USE_FLASH 0x00040000 112#define NAND_BBT_USE_FLASH 0x00020000
115/* Do not store flash based bad block table in OOB area; store it in-band */ 113/* Do not store flash based bad block table in OOB area; store it in-band */
116#define NAND_BBT_NO_OOB 0x00080000 114#define NAND_BBT_NO_OOB 0x00040000
115
116/* The nand_bbt_descr was created dynamicaly and must be freed */
117#define NAND_BBT_DYNAMICSTRUCT 0x80000000
117 118
118/* The maximum number of blocks to scan for a bbt */ 119/* The maximum number of blocks to scan for a bbt */
119#define NAND_BBT_SCAN_MAXBLOCKS 4 120#define NAND_BBT_SCAN_MAXBLOCKS 4
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index c1fca4fd35e7..4a43ffc535c9 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -220,14 +220,14 @@ typedef enum {
220 220
221/* Non chip related options */ 221/* Non chip related options */
222/* This option skips the bbt scan during initialization. */ 222/* This option skips the bbt scan during initialization. */
223#define NAND_SKIP_BBTSCAN 0x00020000 223#define NAND_SKIP_BBTSCAN 0x00010000
224/* 224/*
225 * This option is defined if the board driver allocates its own buffers 225 * This option is defined if the board driver allocates its own buffers
226 * (e.g. because it needs them DMA-coherent). 226 * (e.g. because it needs them DMA-coherent).
227 */ 227 */
228#define NAND_OWN_BUFFERS 0x00040000 228#define NAND_OWN_BUFFERS 0x00020000
229/* Chip may not exist, so silence any errors in scan */ 229/* Chip may not exist, so silence any errors in scan */
230#define NAND_SCAN_SILENT_NODEV 0x00080000 230#define NAND_SCAN_SILENT_NODEV 0x00040000
231 231
232/* Options set by nand scan */ 232/* Options set by nand scan */
233/* Nand scan has allocated controller struct */ 233/* Nand scan has allocated controller struct */