meson64: 6.7 edge: fix SPI-NOR patch for 6.7.y

- general-spi-nor-add-support-for-XT25F128B.patch: fixed same as Paolo did for rockchip64-6.7
This commit is contained in:
Ricardo Pardini
2024-01-14 10:01:55 +01:00
parent 29085a7f73
commit c23caad016

View File

@@ -5,7 +5,9 @@ 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
- found on HK's vendor tree: https://github.com/hardkernel/linux/blame/05e3dc1688758bd401e0f7cdd9809a3f9251f7c1/drivers/mtd/spi-nor/spi-nor.c#L1024-L1026
- Ricardo pardini <ricardo@pardini.net> 14/jan/2024: convert to new SNOR_ID format
- I just followed the lead Paolo used in rockchip64's 6.7
Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
@@ -25,8 +27,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 | 17 ++++++++++
4 files changed, 20 insertions(+)
drivers/mtd/spi-nor/xtx.c | 19 ++++++++++
4 files changed, 22 insertions(+)
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 5e68468b72fc..4463d161aa5b 100644
@@ -66,10 +68,10 @@ index 93cd2fc3606d..349a11a2e9f5 100644
diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c
new file mode 100644
index 000000000000..900f2ac146a3
index 000000000000..eec9be2d9667
--- /dev/null
+++ b/drivers/mtd/spi-nor/xtx.c
@@ -0,0 +1,17 @@
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/mtd/spi-nor.h>
@@ -78,8 +80,10 @@ index 000000000000..900f2ac146a3
+
+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) },
+ // { "xt25f128b", INFO(0x0b4018, 0, 64 * 1024, 256) },
+ { "xt25f128b", SNOR_ID(0x0b, 0x40, 0x18) },
+ // { "XT25Q64", INFO(0x0b6017, 0, 64 * 1024, 128) },
+ { "XT25Q64", SNOR_ID(0x0b, 0x60, 0x17) },
+};
+
+const struct spi_nor_manufacturer spi_nor_xtx = {