kernel: mtd: backport Macronix sector size fix
Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1010,6 +1010,66 @@ write_err:
|
||||
@@ -1012,6 +1012,66 @@ write_err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
static int macronix_quad_enable(struct spi_nor *nor)
|
||||
{
|
||||
int ret, val;
|
||||
@@ -1188,10 +1248,12 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -1190,10 +1250,12 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
}
|
||||
|
||||
/* sst nor chips use AAI word program */
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
if (info->flags & USE_FSR)
|
||||
nor->flags |= SNOR_F_USE_FSR;
|
||||
@@ -1219,11 +1281,20 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -1221,11 +1283,20 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
mtd->writebufsize = nor->page_size;
|
||||
|
||||
if (np) {
|
||||
|
||||
Reference in New Issue
Block a user