Home Explore Help
Register Sign In
FreifunkHochstift
/
gluon
6
0
Fork 0
Files Issues 0 Pull Requests 0
Tree: 0d2b078a17
Branches Tags
gluon
/
patches
/
openwrt
/
0031-kernel-mtd-spi-nor-unlock-Winbond-flashs.patch

0031-kernel-mtd-spi-nor-unlock-Winbond-flashs.patch 2.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
    2. 

  2. Date: Sat, 7 May 2016 00:29:06 +0200
    3. 

  3. Subject: kernel: mtd: spi-nor: unlock Winbond flashs
    4. 

  4. 

  5. diff --git a/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
    6. 

  6. new file mode 100644
    7. 

  7. index 0000000000000000000000000000000000000000..4682b7a77b160a0814012d26f0edf1a7bfaf5312
    8. 

  8. --- /dev/null
    9. 

  9. +++ b/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
    10. 

  10. @@ -0,0 +1,46 @@
    11. 

  11. +From 20bbd73b6b04677a73933830363ab3178adc2ce9 Mon Sep 17 00:00:00 2001
    12. 

  12. +Message-Id: <20bbd73b6b04677a73933830363ab3178adc2ce9.1462573588.git.mschiffer@universe-factory.net>
    13. 

  13. +From: Matthias Schiffer <mschiffer@universe-factory.net>
    14. 

  14. +Date: Sat, 7 May 2016 00:26:23 +0200
    15. 

  15. +Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with
    16. 

  16. + Winbond)"
    17. 

  17. +
    18. 

  18. +This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e.
    19. 

  19. +---
    20. 

  20. + drivers/mtd/spi-nor/spi-nor.c | 6 ++++--
    21. 

  21. + include/linux/mtd/spi-nor.h   | 2 +-
    22. 

  22. + 2 files changed, 5 insertions(+), 3 deletions(-)
    23. 

  23. +
    24. 

  24. +--- a/drivers/mtd/spi-nor/spi-nor.c
    25. 

  25. ++++ b/drivers/mtd/spi-nor/spi-nor.c
    26. 

  26. +@@ -1165,7 +1165,8 @@ int spi_nor_scan(struct spi_nor *nor, co
    27. 

  27. + 	if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
    28. 

  28. + 	    JEDEC_MFR(info) == SNOR_MFR_INTEL ||
    29. 

  29. + 	    JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
    30. 

  30. +-	    JEDEC_MFR(info) == SNOR_MFR_SST) {
    31. 

  31. ++	    JEDEC_MFR(info) == SNOR_MFR_SST ||
    32. 

  32. ++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
    33. 

  33. + 		write_enable(nor);
    34. 

  34. + 		write_sr(nor, 0);
    35. 

  35. + 		spi_nor_wait_till_ready(nor);
    36. 

  36. +@@ -1182,7 +1183,8 @@ int spi_nor_scan(struct spi_nor *nor, co
    37. 

  37. + 	mtd->_read = spi_nor_read;
    38. 

  38. + 
    39. 

  39. + 	/* NOR protection support for STmicro/Micron chips and similar */
    40. 

  40. +-	if (JEDEC_MFR(info) == SNOR_MFR_MICRON) {
    41. 

  41. ++	if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
    42. 

  42. ++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
    43. 

  43. + 		nor->flash_lock = stm_lock;
    44. 

  44. + 		nor->flash_unlock = stm_unlock;
    45. 

  45. + 		nor->flash_is_locked = stm_is_locked;
    46. 

  46. +--- a/include/linux/mtd/spi-nor.h
    47. 

  47. ++++ b/include/linux/mtd/spi-nor.h
    48. 

  48. +@@ -25,7 +25,7 @@
    49. 

  49. + #define SNOR_MFR_MACRONIX	CFI_MFR_MACRONIX
    50. 

  50. + #define SNOR_MFR_SPANSION	CFI_MFR_AMD
    51. 

  51. + #define SNOR_MFR_SST		CFI_MFR_SST
    52. 

  52. +-#define SNOR_MFR_WINBOND	0xef /* Also used by some Spansion */
    53. 

  53. ++#define SNOR_MFR_WINBOND	0xef
    54. 

  54. + 
    55. 

  55. + /*
    56. 

  56. +  * Note on opcode nomenclature: some opcodes have a format like
    57.