domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: remove duplicate flash chip definition

Browse Source 
XTX XT25F128A shares it's chip ID with XM25QH128A which got identical
features. Hence there it makes no sense to add it to the driver.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2020-02-05 17:43:03 +02:00
parent 0046aef672
commit 6f10aa737e
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch → target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128b.patch
View File

@@ -1,14 +1,14 @@
From patchwork Thu Jan 30 08:55:12 2020 From patchwork Thu Feb 6 17:19:41 2020
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org> X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
X-Patchwork-Id: 1231340 X-Patchwork-Id: 1234465
Date: Thu, 30 Jan 2020 10:55:12 +0200 Date: Thu, 6 Feb 2020 19:19:41 +0200
From: Daniel Golle <daniel@makrotopia.org> From: Daniel Golle <daniel@makrotopia.org>
To: linux-mtd@lists.infradead.org To: linux-mtd@lists.infradead.org
Subject: [PATCH] mtd: spi-nor: Add support for xt25f128 chips Subject: [PATCH v2] mtd: spi-nor: Add support for xt25f128b chip
Message-ID: <20200130085512.GA243814@makrotopia.org> Message-ID: <20200206171941.GA2398@makrotopia.org>
MIME-Version: 1.0 MIME-Version: 1.0
Content-Disposition: inline Content-Disposition: inline
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
@@ -18,8 +18,8 @@ Cc: Eitan Cohen <eitan@neot-semadar.com>, Piotr Dymacz <pepe2k@gmail.com>,
Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org>
Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Add XT25F128A and XT25F128B made by XTX Technology (Shenzhen) Limited. Add XT25F128B made by XTX Technology (Shenzhen) Limited.
Both chips supports dual and quad read and uniform 4K-byte erase. This chip supports dual and quad read and uniform 4K-byte erase.
Verified on Teltonika RUT955 which comes with XT25F128B in recent Verified on Teltonika RUT955 which comes with XT25F128B in recent
versions of the device. versions of the device.
@@ -30,13 +30,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/spi-nor/spi-nor.c --- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1198,6 +1198,10 @@ static const struct flash_info spi_nor_i @@ -1198,6 +1198,9 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ +
+ /* XTX Technology (Shenzhen) Limited */ + /* XTX Technology (Shenzhen) Limited */
+ { "xt25f128a", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ }, { },
}; };

17
target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch → target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128b.patch
View File

@@ -1,14 +1,14 @@
From patchwork Thu Jan 30 08:55:12 2020 From patchwork Thu Feb 6 17:19:41 2020
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org> X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
X-Patchwork-Id: 1231340 X-Patchwork-Id: 1234465
Date: Thu, 30 Jan 2020 10:55:12 +0200 Date: Thu, 6 Feb 2020 19:19:41 +0200
From: Daniel Golle <daniel@makrotopia.org> From: Daniel Golle <daniel@makrotopia.org>
To: linux-mtd@lists.infradead.org To: linux-mtd@lists.infradead.org
Subject: [PATCH] mtd: spi-nor: Add support for xt25f128 chips Subject: [PATCH v2] mtd: spi-nor: Add support for xt25f128b chip
Message-ID: <20200130085512.GA243814@makrotopia.org> Message-ID: <20200206171941.GA2398@makrotopia.org>
MIME-Version: 1.0 MIME-Version: 1.0
Content-Disposition: inline Content-Disposition: inline
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
@@ -18,8 +18,8 @@ Cc: Eitan Cohen <eitan@neot-semadar.com>, Piotr Dymacz <pepe2k@gmail.com>,
Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org>
Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Add XT25F128A and XT25F128B made by XTX Technology (Shenzhen) Limited. Add XT25F128B made by XTX Technology (Shenzhen) Limited.
Both chips supports dual and quad read and uniform 4K-byte erase. This chip supports dual and quad read and uniform 4K-byte erase.
Verified on Teltonika RUT955 which comes with XT25F128B in recent Verified on Teltonika RUT955 which comes with XT25F128B in recent
versions of the device. versions of the device.
@@ -30,13 +30,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/spi-nor/spi-nor.c --- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1273,6 +1273,10 @@ static const struct flash_info spi_nor_i @@ -1273,6 +1273,9 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ +
+ /* XTX Technology (Shenzhen) Limited */ + /* XTX Technology (Shenzhen) Limited */
+ { "xt25f128a", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ }, { },
}; };