diff options
| author | John Crispin <john@phrozen.org> | 2016-12-25 20:11:34 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-08-05 08:46:36 +0200 |
| commit | 74d00a8c3849c1340efd713eb94b786e304c201f (patch) | |
| tree | de481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch | |
| parent | de350550ef648d9728351b986b0516fa29465c45 (diff) | |
| download | upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz upstream-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2 upstream-74d00a8c3849c1340efd713eb94b786e304c201f.zip | |
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches
* merge debloat patches
* merge Kconfig patches
* merge swconfig patches
* merge hotplug patches
* drop 200-fix_localversion.patch - upstream
* drop 222-arm_zimage_none.patch - unused
* drop 252-mv_cesa_depends.patch - no longer required
* drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused
* drop 661-fq_codel_keep_dropped_stats.patch - outdated
* drop 702-phy_add_aneg_done_function.patch - upstream
* drop 840-rtc7301.patch - unused
* drop 841-rtc_pt7c4338.patch - upstream
* drop 921-use_preinit_as_init.patch - unused
* drop spio-gpio-old and gpio-mmc - unused
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch b/target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch new file mode 100644 index 0000000000..69a5432fa7 --- /dev/null +++ b/target/linux/generic/pending-4.4/048-mtd-spi-nor-backport-SPI_NOR_HAS_LOCK-flag.patch @@ -0,0 +1,47 @@ +From 76a4707de5e18dc32d9cb4e990686140c5664a15 Mon Sep 17 00:00:00 2001 +From: Brian Norris <computersforpeace@gmail.com> +Date: Fri, 29 Jan 2016 11:25:35 -0800 +Subject: [PATCH] mtd: spi-nor: add SPI_NOR_HAS_LOCK flag + +We can't determine this purely by manufacturer type (see commit +67b9bcd36906 ("mtd: spi-nor: fix Spansion regressions (aliased with +Winbond)")), and it's not autodetectable by anything like SFDP. So make +a new flag for it. + +Signed-off-by: Brian Norris <computersforpeace@gmail.com> +Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> +Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> +--- + drivers/mtd/spi-nor/spi-nor.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -68,6 +68,7 @@ struct flash_info { + #define SPI_NOR_DUAL_READ 0x20 /* Flash supports Dual Read */ + #define SPI_NOR_QUAD_READ 0x40 /* Flash supports Quad Read */ + #define USE_FSR 0x80 /* use flag status register */ ++#define SPI_NOR_HAS_LOCK 0x100 /* Flash supports lock/unlock via SR */ + }; + + #define JEDEC_MFR(info) ((info)->id[0]) +@@ -1163,7 +1164,8 @@ int spi_nor_scan(struct spi_nor *nor, co + + if (JEDEC_MFR(info) == SNOR_MFR_ATMEL || + JEDEC_MFR(info) == SNOR_MFR_INTEL || +- JEDEC_MFR(info) == SNOR_MFR_SST) { ++ JEDEC_MFR(info) == SNOR_MFR_SST || ++ info->flags & SPI_NOR_HAS_LOCK) { + write_enable(nor); + write_sr(nor, 0); + } +@@ -1179,7 +1181,8 @@ int spi_nor_scan(struct spi_nor *nor, co + mtd->_read = spi_nor_read; + + /* NOR protection support for STmicro/Micron chips and similar */ +- if (JEDEC_MFR(info) == SNOR_MFR_MICRON) { ++ if (JEDEC_MFR(info) == SNOR_MFR_MICRON || ++ info->flags & SPI_NOR_HAS_LOCK) { + nor->flash_lock = stm_lock; + nor->flash_unlock = stm_unlock; + nor->flash_is_locked = stm_is_locked; |