mediatek: cudy nand: fix wrong nmbm configuration

Nmbm is mistakenly enabled on ubootmod builds of nand Cudy routers:
------------------------------------------------------------------------
[    0.923433] spi-nand spi0.0: calibration result: 0x3
[    0.928485] spi-nand spi0.0: ESMT SPI NAND was found.
[    0.933560] spi-nand spi0.0: 128 MiB, block size: 128 KiB, page size:
2048, OOB size: 64
[    1.828275] Signature not found
-------------------------------------------------------------------------

This commit disables nmbm for such builds.

Fixes: eb6dd61 ("mediatek: add cudy wr3000h-v1 ubootmod")
Fixes: cfc17e8 ("mediatek: add cudy wr3000e-v1 ubootmod")
Fixes: 6b3b7c7 ("mediatek: add cudy wr3000p-v1 ubootmod")
Fixes: b7b4938 ("mediatek: add cudy wr3000s-v1 ubootmod")
Fixes: 15df98f ("mediatek: add ubootmod layout for Cudy WBR3000UAX v1")
Signed-off-by: Mikhail Zhilkin <csharper2005@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22832
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wbr3000uax-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wbr3000uax-v1.dts
index 9402a319de467e73f6f32eb80c086e6cd1122820..aac47268d8a453fa4f9e177dae314505dceb266a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wbr3000uax-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wbr3000uax-v1.dts
@@ -7,3 +7,9 @@
        model = "Cudy WBR3000UAX v1";
        compatible = "cudy,wbr3000uax-v1", "mediatek,mt7981";
 };
+
+&spi_nand {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-nand.dtsi b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-nand.dtsi
index a3e4c7e4febbf86a47d9cf8659d7640eaf5935d2..3b505cc740d2d9fc4ddf82ce807ffe0c1755732b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-nand.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-nand.dtsi
@@ -85,9 +85,6 @@
 
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
-               mediatek,nmbm;
-               mediatek,bmt-max-ratio = <1>;
-               mediatek,bmt-max-reserved-blocks = <64>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000e-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000e-v1.dts
index c737ff227cc0d90c708edf0788699ffc21e9e4c8..fcf9d1334113499236e5cc9dc44113cd1ee9f851 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000e-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000e-v1.dts
@@ -8,3 +8,9 @@
        model = "Cudy WR3000E v1";
        compatible = "cudy,wr3000e-v1", "mediatek,mt7981";
 };
+
+&spi_nand {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
index b21cf5206f1bcaee9d177bc0df4aa11ed2eae1b1..497062ec68dd377c0c412c86e069a9d3f8088687 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
@@ -8,3 +8,9 @@
        model = "Cudy WR3000H v1";
        compatible = "cudy,wr3000h-v1", "mediatek,mt7981";
 };
+
+&spi_nand {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000p-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000p-v1.dts
index 2d1bf9707042ec02dd45794b62a55794197069e8..50bcecadf30e251a8167a78801be0fb746bbd265 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000p-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000p-v1.dts
@@ -8,3 +8,9 @@
        model = "Cudy WR3000P v1";
        compatible = "cudy,wr3000p-v1", "mediatek,mt7981";
 };
+
+&spi_nand {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
index a61421319cf4f5b5cdf09db795c54cd3cf579ec4..cc892d821e75b11b03e9d3202673d84b69172341 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
@@ -8,3 +8,9 @@
        model = "Cudy WR3000S v1";
        compatible = "cudy,wr3000s-v1", "mediatek,mt7981";
 };
+
+&spi_nand {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};