kernel: bump 4.14 to 4.14.159

[oweals/openwrt.git] / target / linux / generic / backport-4.9 / 062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch

diff --git a/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch b/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
index 87b83cc5dd5fd39481f3bdc4c44dc5b60dbe13b8..a17498492189fd2167cb549ffbff00e4bc4f8f0f 100644 (file)
--- a/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
+++ b/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
@@ -140,7 +140,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
  /* NOTE: double check command sets and memory organization when you add
   * more nor chips.  This current list focusses on newer chips, which
   * have been converging on command sets which including JEDEC ID.
-@@ -1014,6 +1073,13 @@ static const struct flash_info spi_nor_i
+@@ -1020,6 +1079,13 @@ static const struct flash_info spi_nor_i
        { "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
@@ -154,7 +154,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
        { },
  };
  
-@@ -1054,7 +1120,12 @@ static int spi_nor_read(struct mtd_info
+@@ -1060,7 +1126,12 @@ static int spi_nor_read(struct mtd_info
                return ret;
  
        while (len) {
@@ -168,7 +168,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                if (ret == 0) {
                        /* We shouldn't see 0-length reads */
                        ret = -EIO;
-@@ -1175,8 +1246,23 @@ static int spi_nor_write(struct mtd_info
+@@ -1181,8 +1252,23 @@ static int spi_nor_write(struct mtd_info
  
        for (i = 0; i < len; ) {
                ssize_t written;
@@ -193,7 +193,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                WARN_ONCE(page_offset,
                          "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.",
                          page_offset);
-@@ -1184,8 +1270,11 @@ static int spi_nor_write(struct mtd_info
+@@ -1190,8 +1276,11 @@ static int spi_nor_write(struct mtd_info
                page_remain = min_t(size_t,
                                    nor->page_size - page_offset, len - i);
  
@@ -206,7 +206,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
                if (ret < 0)
                        goto write_err;
                written = ret;
-@@ -1319,6 +1408,47 @@ static int spi_nor_check(struct spi_nor
+@@ -1325,6 +1414,47 @@ static int spi_nor_check(struct spi_nor
        return 0;
  }
  
@@ -254,7 +254,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
  int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
  {
        const struct flash_info *info = NULL;
-@@ -1367,6 +1497,14 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1373,6 +1503,14 @@ int spi_nor_scan(struct spi_nor *nor, co
        mutex_init(&nor->lock);
  
        /*
@@ -269,7 +269,7 @@ Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
         * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
         * with the software protection bits set
         */
-@@ -1524,6 +1662,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1530,6 +1668,12 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        nor->read_dummy = spi_nor_read_dummy_cycles(nor);