generic: refresh patches

just run: make target/linux/refresh V=s

Fixes: 6e315de0f422acf66c3505a4ed8c095a0f5d3424
Signed-off-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>

diff --git a/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch b/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
index 5c71c9cf7060c7c93b33d5d17a78ee88780af3a0..4e632b05a07ad16fa2b3fc307e4d464e6ecd4bcc 100644 (file)
--- a/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
+++ b/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
@@ -8,22 +8,17 @@ Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  drivers/mtd/spi-nor/spi-nor.c | 5 +++++
  1 file changed, 5 insertions(+)
 
  drivers/mtd/spi-nor/spi-nor.c | 5 +++++
  1 file changed, 5 insertions(+)
 

-diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
-index f4afe123e9dc..a34fa42d47a2 100644

 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c

-@@ -2346,6 +2346,11 @@ static const struct flash_info spi_nor_ids[] = {
-       { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
+@@ -976,6 +976,11 @@ static const struct flash_info spi_nor_i

  
        /* GigaDevice */
  
        /* GigaDevice */

-+      {
+       {

 +              "gd25d05", INFO(0xc84010, 0, 64 * 1024,  1,
 +                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
 +                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 +      },
 +              "gd25d05", INFO(0xc84010, 0, 64 * 1024,  1,
 +                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
 +                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 +      },

-       {
++      {

                "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
                        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
                "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
                        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

--- 
-2.17.1
-
+                       SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)

diff --git a/target/linux/generic/pending-4.19/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch b/target/linux/generic/pending-4.19/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
index 5c71c9cf7060c7c93b33d5d17a78ee88780af3a0..69c0e66d994cfd21d52d828d92667897a7426a64 100644 (file)
--- a/target/linux/generic/pending-4.19/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
+++ b/target/linux/generic/pending-4.19/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
@@ -8,22 +8,17 @@ Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  drivers/mtd/spi-nor/spi-nor.c | 5 +++++
  1 file changed, 5 insertions(+)
 
  drivers/mtd/spi-nor/spi-nor.c | 5 +++++
  1 file changed, 5 insertions(+)
 

-diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
-index f4afe123e9dc..a34fa42d47a2 100644

 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c

-@@ -2346,6 +2346,11 @@ static const struct flash_info spi_nor_ids[] = {
-       { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
+@@ -1017,6 +1017,11 @@ static const struct flash_info spi_nor_i

  
        /* GigaDevice */
  
        /* GigaDevice */

-+      {
+       {

 +              "gd25d05", INFO(0xc84010, 0, 64 * 1024,  1,
 +                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
 +                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 +      },
 +              "gd25d05", INFO(0xc84010, 0, 64 * 1024,  1,
 +                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
 +                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 +      },

-       {
++      {

                "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
                        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
                "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
                        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

--- 
-2.17.1
-
+                       SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)

diff --git a/target/linux/generic/pending-5.4/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch b/target/linux/generic/pending-5.4/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
deleted file mode 100644 (file)
index 5c71c9c..0000000
--- a/target/linux/generic/pending-5.4/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d68b4aa22e8c625685bfad642dd7337948dc0ad1 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Mon, 6 Jan 2020 13:07:56 +0100
-Subject: [PATCH] mtd: spi-nor: add support for Gigadevice GD25D05
-
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
----
- drivers/mtd/spi-nor/spi-nor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
-index f4afe123e9dc..a34fa42d47a2 100644
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2346,6 +2346,11 @@ static const struct flash_info spi_nor_ids[] = {
-       { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
- 
-       /* GigaDevice */
-+      {
-+              "gd25d05", INFO(0xc84010, 0, 64 * 1024,  1,
-+                      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                      SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-+      },
-       {
-               "gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
-                       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
--- 
-2.17.1
-