ramips: move spi-nor-add-gd25q512 patch to generic
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Mon, 8 Mar 2021 03:31:50 +0000 (19:31 -0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 19 Mar 2021 00:25:26 +0000 (01:25 +0100)
A SPI NOR flash should not be target-specific, so move it to generic in
case another platform needs to use it.

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch [new file with mode: 0644]
target/linux/ramips/patches-5.10/420-spi-nor-add-gd25q512.patch [deleted file]

diff --git a/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch b/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch
new file mode 100644 (file)
index 0000000..6f41546
--- /dev/null
@@ -0,0 +1,12 @@
+--- a/drivers/mtd/spi-nor/gigadevice.c
++++ b/drivers/mtd/spi-nor/gigadevice.c
+@@ -53,6 +53,9 @@ static const struct flash_info gigadevic
+                          SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK |
+                          SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6)
+               .fixups = &gd25q256_fixups },
++      { "gd25q512", INFO(0xc84020, 0, 64 * 1024, 1024,
++                         SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
++                         SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4B_OPCODES) },
+ };
+ const struct spi_nor_manufacturer spi_nor_gigadevice = {
diff --git a/target/linux/ramips/patches-5.10/420-spi-nor-add-gd25q512.patch b/target/linux/ramips/patches-5.10/420-spi-nor-add-gd25q512.patch
deleted file mode 100644 (file)
index 6f41546..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/spi-nor/gigadevice.c
-+++ b/drivers/mtd/spi-nor/gigadevice.c
-@@ -53,6 +53,9 @@ static const struct flash_info gigadevic
-                          SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK |
-                          SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6)
-               .fixups = &gd25q256_fixups },
-+      { "gd25q512", INFO(0xc84020, 0, 64 * 1024, 1024,
-+                         SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-+                         SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4B_OPCODES) },
- };
- const struct spi_nor_manufacturer spi_nor_gigadevice = {