diff options
| author | Victor Shyba <victor1984@riseup.net> | 2016-12-20 05:19:08 -0300 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-01-03 19:58:00 +0100 |
| commit | d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40 (patch) | |
| tree | b5723cc59f2456cbda62eeee4556c8cf88b7c50f /target/linux/ramips | |
| parent | 799d0dddf608ff012b49282d5832ddd2ef1b916e (diff) | |
| download | upstream-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.tar.gz upstream-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.tar.bz2 upstream-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.zip | |
generic: mtd: backport SPI_NOR_HAS_LOCK
This flag was added to 4.9 with upstream commit
76a4707de5e18dc32d9cb4e990686140c5664a15.
Signed-off-by: Victor Shyba <victor1984@riseup.net>
[refresh and adjust platform patches, fix commit message]
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch index a87d5cd25b..8eef3affed 100644 --- a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch +++ b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1013,6 +1013,66 @@ write_err: +@@ -1014,6 +1014,66 @@ write_err: return ret; } @@ -67,7 +67,7 @@ static int macronix_quad_enable(struct spi_nor *nor) { int ret, val; -@@ -1191,10 +1251,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1194,10 +1254,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; -@@ -1222,11 +1284,20 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1225,11 +1287,20 @@ int spi_nor_scan(struct spi_nor *nor, co mtd->writebufsize = nor->page_size; if (np) { |