X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fipq40xx%2Fpatches-4.19%2F303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch;fp=target%2Flinux%2Fipq40xx%2Fpatches-4.19%2F303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch;h=0000000000000000000000000000000000000000;hp=4cabfc8f5948f5d6f8f73b7df8acea5222cdec45;hb=a7afeb31421bd6810c903468b23734baa6999438;hpb=c78e123d5a5e7c3baa74f326613a14f7e99a29a3

diff --git a/target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch b/target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
deleted file mode 100644
index 4cabfc8f59..0000000000
--- a/target/linux/ipq40xx/patches-4.19/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1099,6 +1099,7 @@ static const struct flash_info spi_nor_i
- 	{ "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256,
- 			 SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
- 	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+	{ "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
- 	{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
- 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
- 	{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
-@@ -1286,11 +1287,12 @@ static const struct flash_info spi_nor_i
- 	{ },
- };
- 
--static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
-+static const struct flash_info *spi_nor_read_id(struct spi_nor *nor,
-+						const char *name)
- {
- 	int			tmp;
- 	u8			id[SPI_NOR_MAX_ID_LEN];
--	const struct flash_info	*info;
-+	const struct flash_info	*info, *first_match = NULL;
- 
- 	tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
- 	if (tmp < 0) {
-@@ -1301,10 +1303,16 @@ static const struct flash_info *spi_nor_
- 	for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
- 		info = &spi_nor_ids[tmp];
- 		if (info->id_len) {
--			if (!memcmp(info->id, id, info->id_len))
--				return &spi_nor_ids[tmp];
-+			if (!memcmp(info->id, id, info->id_len)) {
-+				if (!name || !strcmp(name, info->name))
-+					return info;
-+				if (!first_match)
-+					first_match = info;
-+			}
- 		}
- 	}
-+	if (first_match)
-+		return first_match;
- 	dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
- 		id[0], id[1], id[2]);
- 	return ERR_PTR(-ENODEV);
-@@ -2838,7 +2846,7 @@ int spi_nor_scan(struct spi_nor *nor, co
- 		info = spi_nor_match_id(name);
- 	/* Try to auto-detect if chip name wasn't specified or not found */
- 	if (!info)
--		info = spi_nor_read_id(nor);
-+		info = spi_nor_read_id(nor, NULL);
- 	if (IS_ERR_OR_NULL(info))
- 		return -ENOENT;
- 
-@@ -2849,7 +2857,7 @@ int spi_nor_scan(struct spi_nor *nor, co
- 	if (name && info->id_len) {
- 		const struct flash_info *jinfo;
- 
--		jinfo = spi_nor_read_id(nor);
-+		jinfo = spi_nor_read_id(nor, name);
- 		if (IS_ERR(jinfo)) {
- 			return PTR_ERR(jinfo);
- 		} else if (jinfo != info) {