Pull MTD changes from Brian Norris: - Unify some compile-time differences so that we have fewer uses of #ifdef CONFIG_OF in atmel_nand - Other general cleanups (removing unused functions, options, variables, fields; use correct interfaces) - Fix BUG() for new odd-sized NAND, which report non-power-of-2 dimensions via ONFI - Miscellaneous driver fixes (SPI NOR flash; BCM47xx NAND flash; etc.) - Improve differentiation between SLC and MLC NAND -- this clarifies an ABI issue regarding the MTD "type" (in sysfs and in the MEMGETINFO ioctl), where the MTD_MLCNANDFLASH type was present but inconsistently used - Extend GPMI NAND to support multi-chip-select NAND for some platforms - Many improvements to the OMAP2/3 NAND driver, including an expanded DT binding to bring us closer to mainline support for some OMAP systems - Fix a deadlock in the error path of the Atmel NAND driver probe - Correct the error codes from MTD mmap() to conform to POSIX and the Linux Programmer's Manual. This is an acknowledged change in the MTD ABI, but I can't imagine somebody relying on the non-standard -ENOSYS error code specifically. Am I just being unimaginative? :) - Fix a few important GPMI NAND bugs (one regression from 3.12 and one long-standing race condition) - More? Read the log! * tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd: (98 commits) mtd: gpmi: fix the NULL pointer mtd: gpmi: fix kernel BUG due to racing DMA operations mtd: mtdchar: return expected errors on mmap() call mtd: gpmi: only scan two chips for imx6 mtd: gpmi: Use devm_kzalloc() mtd: atmel_nand: fix bug driver will in a dead lock if no nand detected mtd: nand: use a local variable to simplify the nand_scan_tail mtd: nand: remove deprecated IRQF_DISABLED mtd: dataflash: Say if we find a device we don't support mtd: nand: omap: fix error return code in omap_nand_probe() mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES mtd: m25p80: fixup device removal failure path mtd: mxc_nand: Include linux/of.h header mtd: remove duplicated include from mtdcore.c mtd: m25p80: add support for Macronix mx25l3255e mtd: nand: omap: remove selection of BCH ecc-scheme via KConfig mtd: nand: omap: updated devm_xx for all resource allocation and free calls mtd: nand: omap: use drivers/mtd/nand/nand_bch.c wrapper for BCH ECC instead of lib/bch.c mtd: nand: omap: clean-up ecc layout for BCH ecc schemes mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe ...
Showing the changes to include/uapi (2 of 65 files). Show all
Unified · Split
| @@ -54,6 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | #define ACSI_MAJOR 28 |
| 55 | 55 | #define AZTECH_CDROM_MAJOR 29 |
| 56 | 56 | #define FB_MAJOR 29 /* /dev/fb* framebuffers */ |
| 57 | +#define MTD_BLOCK_MAJOR 31 | |
| 57 | 58 | #define CM206_CDROM_MAJOR 32 |
| 58 | 59 | #define IDE2_MAJOR 33 |
| 59 | 60 | #define IDE3_MAJOR 34 |
| @@ -105,6 +106,7 @@ · 45 unmodified lines | ||
| 105 | 106 | #define IDE6_MAJOR 88 |
| 106 | 107 | #define IDE7_MAJOR 89 |
| 107 | 108 | #define IDE8_MAJOR 90 |
| 109 | +#define MTD_CHAR_MAJOR 90 | |
| 108 | 110 | #define IDE9_MAJOR 91 |
| 109 | 111 | |
| 110 | 112 | #define DASD_MAJOR 94 |
| @@ -94,10 +94,10 @@ struct mtd_write_req { · 93 unmodified lines | ||
| 94 | 94 | #define MTD_RAM 1 |
| 95 | 95 | #define MTD_ROM 2 |
| 96 | 96 | #define MTD_NORFLASH 3 |
| 97 | −#define MTD_NANDFLASH 4 | |
| 97 | +#define MTD_NANDFLASH 4 /* SLC NAND */ | |
| 98 | 98 | #define MTD_DATAFLASH 6 |
| 99 | 99 | #define MTD_UBIVOLUME 7 |
| 100 | −#define MTD_MLCNANDFLASH 8 | |
| 100 | +#define MTD_MLCNANDFLASH 8 /* MLC NAND (including TLC) */ | |
| 101 | 101 | |
| 102 | 102 | #define MTD_WRITEABLE 0x400 /* Device is writeable */ |
| 103 | 103 | #define MTD_BIT_WRITEABLE 0x800 /* Single bits can be flipped */ |
| @@ -275,4 +275,9 @@ enum mtd_file_modes { · 171 unmodified lines | ||
| 275 | 275 | MTD_FILE_MODE_RAW, |
| 276 | 276 | }; |
| 277 | 277 | |
| 278 | +static inline int mtd_type_is_nand_user(const struct mtd_info_user *mtd) | |
| 279 | +{ | |
| 280 | + return mtd->type == MTD_NANDFLASH || mtd->type == MTD_MLCNANDFLASH; | |
| 281 | +} | |
| 282 | + | |
| 278 | 283 | #endif /* __MTD_ABI_H__ */ |