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/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch | |
parent | 799d0dddf608ff012b49282d5832ddd2ef1b916e (diff) | |
download | mtk-20170518-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.zip mtk-20170518-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.tar.gz mtk-20170518-d6c831e0e5a0ef97eb054dd3eb382d66b1bffc40.tar.bz2 |
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/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch')
-rw-r--r-- | target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch b/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch index 9b3f69d..9cfa269 100644 --- a/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch +++ b/target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch @@ -24,7 +24,7 @@ Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> struct flash_info { char *name; -@@ -73,6 +77,8 @@ struct flash_info { +@@ -74,6 +78,8 @@ struct flash_info { }; #define JEDEC_MFR(info) ((info)->id[0]) @@ -33,7 +33,7 @@ Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> static const struct flash_info *spi_nor_match_id(const char *name); -@@ -785,6 +791,7 @@ static const struct flash_info spi_nor_i +@@ -786,6 +792,7 @@ static const struct flash_info spi_nor_i */ { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, @@ -41,7 +41,7 @@ Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, -@@ -909,6 +916,53 @@ static const struct flash_info *spi_nor_ +@@ -910,6 +917,53 @@ static const struct flash_info *spi_nor_ return ERR_PTR(-ENODEV); } @@ -95,7 +95,7 @@ Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com> static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { -@@ -1247,6 +1301,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1248,6 +1302,12 @@ int spi_nor_scan(struct spi_nor *nor, co write_sr(nor, ret); } |