[][mtd: spinand: winbond: add support for W25NxxKV series]
[Description]
Change part of commit 3d587bd9054bd2f3ce3dc4e5e46e7a190f3851eb.
Move nmbm related change directly to generic/files-5.4
[Release-log]
N/A
Change-Id: Ia2bbdac17891bff9cf7fa8b8036436249711f81d
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/5944439
diff --git a/target/linux/generic/files-5.4/drivers/mtd/nmbm/nmbm-core.c b/target/linux/generic/files-5.4/drivers/mtd/nmbm/nmbm-core.c
index 18dfb6a..b80ea42 100644
--- a/target/linux/generic/files-5.4/drivers/mtd/nmbm/nmbm-core.c
+++ b/target/linux/generic/files-5.4/drivers/mtd/nmbm/nmbm-core.c
@@ -2189,7 +2189,7 @@
return false;
}
- if (!nld->oobsize || !is_power_of_2(nld->oobsize)) {
+ if (!nld->oobsize) {
nmbm_log_lower(nld, NMBM_LOG_ERR,
"Page spare size %u is not valid\n", nld->oobsize);
return false;
diff --git a/target/linux/mediatek/patches-5.4/0490-mtd-spinand-winbond-Support-for-W25MxxGV-W25NxxKV-series.patch b/target/linux/mediatek/patches-5.4/0490-mtd-spinand-winbond-Support-for-W25MxxGV-W25NxxKV-series.patch
index 9dd3659..ba9b72c 100644
--- a/target/linux/mediatek/patches-5.4/0490-mtd-spinand-winbond-Support-for-W25MxxGV-W25NxxKV-series.patch
+++ b/target/linux/mediatek/patches-5.4/0490-mtd-spinand-winbond-Support-for-W25MxxGV-W25NxxKV-series.patch
@@ -188,14 +188,3 @@
+ Winbond W25N01KV share the same ID with W25N01GV. However, they have
+ different attributes.
+
---- a/drivers/mtd/nmbm/nmbm-core.c
-+++ b/drivers/mtd/nmbm/nmbm-core.c
-@@ -2189,7 +2189,7 @@ static bool nmbm_check_lower_members(str
- return false;
- }
-
-- if (!nld->oobsize || !is_power_of_2(nld->oobsize)) {
-+ if (!nld->oobsize) {
- nmbm_log_lower(nld, NMBM_LOG_ERR,
- "Page spare size %u is not valid\n", nld->oobsize);
- return false;