diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-07-14 12:49:28 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-07-15 17:06:26 -0700 |
| commit | 1ed106914abdd6d73f7efba333cd6e044c59b316 (patch) | |
| tree | b30cc450702e74080b6dc49c14fd8912e092e9b1 /include/linux/mtd | |
| parent | 7ddf7c1ea77d10424ae5dfa3c3a4d6a39cdf70a9 (diff) | |
| parent | 8490c03bd9d40ce71d9b67dcf93e73788ba0516d (diff) | |
Merge tag 'nand/for-4.8' of github.com:linux-nand/linux into mtd
Pull NAND changes from Boris Brezillon:
"""
This pull request contains only one notable change:
* Addition of the MTK NAND controller driver
And a bunch of specific NAND driver improvements/fixes. Here are the
changes that are worth mentioning:
* A few fixes/improvements for the xway NAND controller driver
* A few fixes for the sunxi NAND controller driver
* Support for DMA in the sunxi NAND driver
* Support for the sunxi NAND controller IP embedded in A23/A33 SoCs
* Addition for bitflips detection in erased pages to the brcmnand driver
* Support for new brcmnand IPs
* Update of the OMAP-GPMC binding to support DMA channel description
"""
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/nand.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index fbe8e164a4ee..8dd6e01f45c0 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -783,6 +783,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) * NAND Flash Manufacturer ID Codes */ #define NAND_MFR_TOSHIBA 0x98 +#define NAND_MFR_ESMT 0xc8 #define NAND_MFR_SAMSUNG 0xec #define NAND_MFR_FUJITSU 0x04 #define NAND_MFR_NATIONAL 0x8f |