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/brcm63xx | |
| 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/brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch b/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch index 79af8a6360..74af24bbad 100644 --- a/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch +++ b/target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch @@ -68,7 +68,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> spifi->nor.write = nxp_spifi_write; --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1112,7 +1112,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -1113,7 +1113,7 @@ int spi_nor_scan(struct spi_nor *nor, co const struct flash_info *info = NULL; struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; |