diff options
| author | Richard Weinberger <richard@nod.at> | 2017-11-03 00:30:37 +0300 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-11-03 00:30:37 +0300 |
| commit | 16271224bcf09f7bbc9b00f70df7928a3e75fc89 (patch) | |
| tree | 3edc879f262b6cc89ea07cb203ad687b2fd8d44b /include/linux/mtd | |
| parent | 20b2fc79a224dd4741e1481e5bff39d02a416fcc (diff) | |
| parent | 30863e38ebeb500a31cecee8096fb5002677dd9b (diff) | |
| download | linux-16271224bcf09f7bbc9b00f70df7928a3e75fc89.tar.xz | |
Merge tag 'nand/for-4.15' of git://git.infradead.org/l2-mtd
From Boris:
"
Core changes:
* Add a flag to mark NANDs that require 3 address cycles to encode a
page address
* Set a default ECC/free layout when NAND_ECC_NONE is requested
* Fix a bug in panic_nand_write()
Driver changes:
* Another batch of cleanups for the denali driver
* Fix PM support in the atmel driver
* Remove support for platform data in the omap driver
* Fix subpage write in the omap driver
* Fix irq handling in the mtk driver
* Change link order of mtk_ecc and mtk_nand drivers to speed up boot
time
* Change log level of ECC error messages in the mxc driver
* Patch the pxa3xx driver to support Armada 8k platforms
* Add BAM DMA support to the qcom driver
* Convert gpio-nand to the GPIO desc API
* Fix ECC handling in the mt29f driver
"
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/nand-gpio.h | 5 | ||||
| -rw-r--r-- | include/linux/mtd/rawnand.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h index be4f45d89be2..98f71908212d 100644 --- a/include/linux/mtd/nand-gpio.h +++ b/include/linux/mtd/nand-gpio.h @@ -4,11 +4,6 @@ #include <linux/mtd/rawnand.h> struct gpio_nand_platdata { - int gpio_nce; - int gpio_nwp; - int gpio_cle; - int gpio_ale; - int gpio_rdy; void (*adjust_parts)(struct gpio_nand_platdata *, size_t); struct mtd_partition *parts; unsigned int num_parts; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 2b05f4273bab..749bb08c4772 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -177,6 +177,9 @@ enum nand_ecc_algo { */ #define NAND_NEED_SCRAMBLING 0x00002000 +/* Device needs 3rd row address cycle */ +#define NAND_ROW_ADDR_3 0x00004000 + /* Options valid for Samsung large page devices */ #define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG |