Pull mtd fixes from Miquel Raynal: "The main fix that really needs to get in is the revert of the patch adding the new mtd_master class, because it entirely fails the partitioning if a specific Kconfig option is set. We need to think how to handle that differently, so let's revert it as we need to get back to the pen and paper situation again. Otherwise the definition of some Winbond SPI NAND chips are receiving some fixes (geometry and maximum frequency, mostly). And finally a small memory leak gets also fixed" * tag 'mtd/fixes-for-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: mtd: spinand: fix memory leak of ECC engine conf mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants mtd: spinand: winbond: Increase maximum frequency on an octal operation mtd: spinand: winbond: Fix W35N number of planes/LUN Revert "mtd: core: always create master device"
Showing the changes to include/linux (2 of 8 files). Show all
Unified · Split
| @@ -108,7 +108,7 @@ extern void deregister_mtd_parser(struct mtd_part_parser *parser); · 107 unmodified lines | |||
| 108 | deregister_mtd_parser) | 108 | deregister_mtd_parser) |
| 109 | 109 | ||
| 110 | int mtd_add_partition(struct mtd_info *master, const char *name, | 110 | int mtd_add_partition(struct mtd_info *master, const char *name, |
| 111 | long long offset, long long length, struct mtd_info **part); | 111 | long long offset, long long length); |
| 112 | int mtd_del_partition(struct mtd_info *master, int partno); | 112 | int mtd_del_partition(struct mtd_info *master, int partno); |
| 113 | uint64_t mtd_get_device_size(const struct mtd_info *mtd); | 113 | uint64_t mtd_get_device_size(const struct mtd_info *mtd); |
| 114 | 114 | ||
| @@ -113,11 +113,12 @@ · 112 unmodified lines | |||
| 113 | SPI_MEM_DTR_OP_DATA_IN(len, buf, 2), \ | 113 | SPI_MEM_DTR_OP_DATA_IN(len, buf, 2), \ |
| 114 | SPI_MEM_OP_MAX_FREQ(freq)) | 114 | SPI_MEM_OP_MAX_FREQ(freq)) |
| 115 | 115 | ||
| 116 | #define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len) \ | 116 | #define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len, ...) \ |
| 117 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \ | 117 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \ |
| 118 | SPI_MEM_OP_ADDR(2, addr, 2), \ | 118 | SPI_MEM_OP_ADDR(2, addr, 2), \ |
| 119 | SPI_MEM_OP_DUMMY(ndummy, 2), \ | 119 | SPI_MEM_OP_DUMMY(ndummy, 2), \ |
| 120 | SPI_MEM_OP_DATA_IN(len, buf, 2)) | 120 | SPI_MEM_OP_DATA_IN(len, buf, 2), \ |
| 121 | SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0)) | ||
| 121 | 122 | ||
| 122 | #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len) \ | 123 | #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len) \ |
| 123 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \ | 124 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1), \ |
| @@ -151,11 +152,12 @@ · 27 unmodified lines | |||
| 151 | SPI_MEM_DTR_OP_DATA_IN(len, buf, 4), \ | 152 | SPI_MEM_DTR_OP_DATA_IN(len, buf, 4), \ |
| 152 | SPI_MEM_OP_MAX_FREQ(freq)) | 153 | SPI_MEM_OP_MAX_FREQ(freq)) |
| 153 | 154 | ||
| 154 | #define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len) \ | 155 | #define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len, ...) \ |
| 155 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1), \ | 156 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1), \ |
| 156 | SPI_MEM_OP_ADDR(2, addr, 4), \ | 157 | SPI_MEM_OP_ADDR(2, addr, 4), \ |
| 157 | SPI_MEM_OP_DUMMY(ndummy, 4), \ | 158 | SPI_MEM_OP_DUMMY(ndummy, 4), \ |
| 158 | SPI_MEM_OP_DATA_IN(len, buf, 4)) | 159 | SPI_MEM_OP_DATA_IN(len, buf, 4), \ |
| 160 | SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0)) | ||
| 159 | 161 | ||
| 160 | #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_4S_4S_OP(addr, ndummy, buf, len) \ | 162 | #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_4S_4S_OP(addr, ndummy, buf, len) \ |
| 161 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1), \ | 163 | SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1), \ |