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>

1 files changed, 12 insertions, 11 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 {
  * layout or if this information is already purged. Must be used in conjunction
  * with NAND_BBT_CREATE.
  */
-#define NAND_BBT_CREATE_EMPTY   0x01000000
+#define NAND_BBT_CREATE_EMPTY   0x00000400
 /* Search good / bad pattern through all pages of a block */
-#define NAND_BBT_SCANALLPAGES   0x00000400
+#define NAND_BBT_SCANALLPAGES   0x00000800
 /* Scan block empty during good / bad block scan */
-#define NAND_BBT_SCANEMPTY      0x00000800
+#define NAND_BBT_SCANEMPTY      0x00001000
 /* Write bbt if neccecary */
-#define NAND_BBT_WRITE          0x00001000
+#define NAND_BBT_WRITE          0x00002000
 /* Read and write back block contents when writing bbt */
-#define NAND_BBT_SAVECONTENT    0x00002000
+#define NAND_BBT_SAVECONTENT    0x00004000
 /* Search good / bad pattern on the first and the second page */
-#define NAND_BBT_SCAN2NDPAGE    0x00004000
+#define NAND_BBT_SCAN2NDPAGE    0x00008000
 /* Search good / bad pattern on the last page of the eraseblock */
-#define NAND_BBT_SCANLASTPAGE   0x00008000
-/* The nand_bbt_descr was created dynamicaly and must be freed */
-#define NAND_BBT_DYNAMICSTRUCT 0x00200000
+#define NAND_BBT_SCANLASTPAGE   0x00010000
 /*
  * Use a flash based bad block table. By default, OOB identifier is saved in
  * OOB area. This option is passed to the default bad block table function.
  */
-#define NAND_BBT_USE_FLASH      0x00040000
+#define NAND_BBT_USE_FLASH      0x00020000
 /* Do not store flash based bad block table in OOB area; store it in-band */
-#define NAND_BBT_NO_OOB         0x00080000
+#define NAND_BBT_NO_OOB         0x00040000
+
+/* The nand_bbt_descr was created dynamicaly and must be freed */
+#define NAND_BBT_DYNAMICSTRUCT  0x80000000
 
 /* The maximum number of blocks to scan for a bbt */
 #define NAND_BBT_SCAN_MAXBLOCKS 4