meson64: edge/6.2: spi-nor: add support for XT25Q64 in addition to XT25F128B

patch/kernel/archive/meson64-6.2/general-spi-nor-add-support-for-XT25F128B.patch

@@ -1,12 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Thu, 28 Jan 2021 09:43:36 +0000
-Subject: spi-nor: add support for XT25F128B
+Subject: spi-nor: add support for XT25F128B & XT25Q64
 
 This adds support for the XT25F128B as found on the RockPi4b SBC.
+- Ricardo Pardini <ricardo@pardini.net> 23/jan/2023: add XT25Q64 SPI NOR chip
+   - found on HK's vendor tree: https://github.com/hardkernel/linux/blame/05e3dc1688758bd401e0f7cdd9809a3f9251f7c1/drivers/mtd/spi-nor/spi-nor.c#L1024-L1026
 
 Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
----
+Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
 
 This continues the efforts done in [1] & [2] that went stale. I've
 tested this patch on my RockPi4b which only has the xt25f128b (and not
@@ -23,8 +25,8 @@ in the core.{c,h} files.
  drivers/mtd/spi-nor/Makefile |  1 +
  drivers/mtd/spi-nor/core.c   |  1 +
  drivers/mtd/spi-nor/core.h   |  1 +
- drivers/mtd/spi-nor/xtx.c    | 16 ++++++++++
- 4 files changed, 19 insertions(+)
+ drivers/mtd/spi-nor/xtx.c    | 17 ++++++++++
+ 4 files changed, 20 insertions(+)
 
 diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
 index e347b435a038..8992c592a896 100644
@@ -64,10 +66,10 @@ index f03b55cf7e6f..27aeb7dff93b 100644
  
 diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c
 new file mode 100644
-index 000000000000..73568854cf1e
+index 000000000000..900f2ac146a3
 --- /dev/null
 +++ b/drivers/mtd/spi-nor/xtx.c
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,17 @@
 +// SPDX-License-Identifier: GPL-2.0
 +
 +#include <linux/mtd/spi-nor.h>
@@ -77,6 +79,7 @@ index 000000000000..73568854cf1e
 +static const struct flash_info xtx_parts[] = {
 + /* XTX (Shenzhen Xin Tian Xia Tech) */
 + { "xt25f128b", INFO(0x0b4018, 0, 64 * 1024, 256) },
++ { "XT25Q64",   INFO(0x0b6017, 0, 64 * 1024, 128) },
 +};
 +
 +const struct spi_nor_manufacturer spi_nor_xtx = {