diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-01-25 05:34:07 +0100 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-01-25 05:35:03 +0100 |
| commit | b33f7a437c767015f49ac05b35312979de66d26d (patch) | |
| tree | f57a0f961ab4000c332c16e631162136c52d7a9b /include | |
| parent | Linux 4.5-rc1 (diff) | |
| parent | mtd: atmel_nand: Use of_device_get_match_data (diff) | |
| download | linux-b33f7a437c767015f49ac05b35312979de66d26d.tar.xz linux-b33f7a437c767015f49ac05b35312979de66d26d.zip | |
Merge v4.5-rc1 with MTD -next development
To start from a good base.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/bbm.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h index 36bb6a503f19..3bf8f954b642 100644 --- a/include/linux/mtd/bbm.h +++ b/include/linux/mtd/bbm.h @@ -166,7 +166,6 @@ struct bbm_info { }; /* OneNAND BBT interface */ -extern int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd); extern int onenand_default_bbt(struct mtd_info *mtd); #endif /* __LINUX_MTD_BBM_H */ diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index bdd68e22b5a5..a13dfd5bc58b 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -168,6 +168,12 @@ typedef enum { /* Device supports subpage reads */ #define NAND_SUBPAGE_READ 0x00001000 +/* + * Some MLC NANDs need data scrambling to limit bitflips caused by repeated + * patterns. + */ +#define NAND_NEED_SCRAMBLING 0x00002000 + /* Options valid for Samsung large page devices */ #define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG |