diff options
| author | Tom Rini <[email protected]> | 2024-04-14 12:26:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-04-14 15:55:14 -0600 |
| commit | 57cb92de7a9d01be1ce72af003651efc80ac67e2 (patch) | |
| tree | eae708f156dfe7002c03cfbd4c87bacf188a8d90 /include | |
| parent | 266603d8c39cf4d194e2cfe8d86d870590e150e0 (diff) | |
| parent | 248fc16055858c2028a381bb59e12354c4ae19ea (diff) | |
Merge tag 'u-boot-nand-20240414' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
The first patch is by Weizhao Ouyang and avoids sf probe crashes.
The second patch is by Arseniy Krasnov and adds basic support for Amlogic
Meson NAND controller on AXG.
The following four patches are by Alexander Dahl and apply some fixes to
drivers/mtd/nand/raw/ and port some changes applied in Linux.
The following patch is by Bruce Suen and adds support for XTX SPINAND.
Finally, the last patch is again by Arseniy Krasnov and adds access to
OTP region, supporting info, dump, write and lock operations.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/rawnand.h | 7 | ||||
| -rw-r--r-- | include/linux/mtd/spinand.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index fb002ae6411..4abaf4734cf 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -249,6 +249,13 @@ enum nand_ecc_algo { */ #define NAND_USE_BOUNCE_BUFFER 0x00100000 +/* + * Do not try to tweak the timings at runtime. This is needed when the + * controller initializes the timings on itself or when it relies on + * configuration done by the bootloader. + */ +#define NAND_KEEP_TIMINGS 0x00800000 + /* Options set by nand scan */ /* bbt has already been read */ #define NAND_BBT_SCANNED 0x40000000 diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 6f479fa5adc..13b5a52f8b9 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -251,6 +251,7 @@ extern const struct spinand_manufacturer paragon_spinand_manufacturer; extern const struct spinand_manufacturer toshiba_spinand_manufacturer; extern const struct spinand_manufacturer winbond_spinand_manufacturer; extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer; +extern const struct spinand_manufacturer xtx_spinand_manufacturer; /** * struct spinand_op_variants - SPI NAND operation variants |