mediatek: cudy: fixes typo for spi and mtd properties

Same as commit 3674689, correct 'buswidth' to 'bus-width'.
Move the nmbm properties outside the partition definition.
Change uppercase to lowercase, add missing read-only flag.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts
index bd6c15225b4d9f4502b58fd677a8cec61958d394..7101c4bab0a9b859eef48c4788b77a3771f02ddb 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts
@@ -133,8 +133,8 @@
                reg = <0>;
 
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                spi-cal-enable;
                spi-cal-mode = "read-data";

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
index a1eb9c6e1e981a18e7214268d2b55a0fe6e8ba59..2e84d2b538ff750c15eaa63fc52c1bed3460c46e 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
@@ -148,6 +148,7 @@
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -163,6 +164,7 @@
                                label = "bdinfo";
                                reg = <0x380000 0x0040000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -174,25 +176,23 @@
                                                #nvmem-cell-cells = <1>;
                                        };
                                };
-
                        };
 
-                       partition@3C0000 {
+                       partition@3c0000 {
                                label = "FIP";
-                               reg = <0x3C0000 0x0200000>;
+                               reg = <0x3c0000 0x0200000>;
                                read-only;
                        };
 
-                       partition@580000 {
+                       partition@5c0000 {
                                label = "ubi";
-                               reg = <0x5C0000 0x4000000>;
+                               reg = <0x5c0000 0x4000000>;
                                compatible = "linux,ubi";
                        };
                };
        };
 };
 
-
 &pio {
        spi0_flash_pins: spi0-pins {
                mux {

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-m3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-m3000-v1.dts
index 85bdabe47488e4644c38767c8560a4bb84418183..b1797157ac671c7586fe044f92bcda9e53db28da 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-m3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-m3000-v1.dts
@@ -117,7 +117,6 @@
 &spi0 {
        pinctrl-names = "default";
        pinctrl-0 = <&spi0_flash_pins>;
-
        status = "okay";
 
        spi_nand: spi_nand@0 {
@@ -127,18 +126,18 @@
                reg = <0>;
 
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               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";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       mediatek,nmbm;
-                       mediatek,bmt-max-ratio = <1>;
-                       mediatek,bmt-max-reserved-blocks = <64>;
-
                        partition@0 {
                                label = "BL2";
                                reg = <0x0000000 0x0100000>;
@@ -177,6 +176,7 @@
                        partition@3c0000 {
                                label = "FIP";
                                reg = <0x03c0000 0x0200000>;
+                               read-only;
                        };
 
                        partition@5c0000 {

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dts
index 1f03b42b1b04565fd26edf6a1bd0d3a2e4a2d45b..31a2cf51940d30c9e79117993634dcd75f16680c 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dts
@@ -162,6 +162,7 @@
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -177,6 +178,7 @@
                                label = "bdinfo";
                                reg = <0x380000 0x0040000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -188,25 +190,23 @@
                                                #nvmem-cell-cells = <1>;
                                        };
                                };
-
                        };
 
-                       partition@3C0000 {
+                       partition@3c0000 {
                                label = "FIP";
-                               reg = <0x3C0000 0x0200000>;
+                               reg = <0x3c0000 0x0200000>;
                                read-only;
                        };
 
-                       partition@580000 {
+                       partition@5c0000 {
                                label = "ubi";
-                               reg = <0x5C0000 0x4000000>;
+                               reg = <0x5c0000 0x4000000>;
                                compatible = "linux,ubi";
                        };
                };
        };
 };
 
-
 &pio {
        spi0_flash_pins: spi0-pins {
                mux {

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
index 0808eb9557a251d8f69cb051a9d02e2891238647..1bf166e0bf88bffffd04f539bb0505b68a241184 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000h-v1.dts
@@ -227,6 +227,7 @@
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -242,6 +243,7 @@
                                label = "bdinfo";
                                reg = <0x380000 0x0040000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -255,15 +257,15 @@
                                };
                        };
 
-                       partition@3C0000 {
+                       partition@3c0000 {
                                label = "FIP";
-                               reg = <0x3C0000 0x0200000>;
+                               reg = <0x3c0000 0x0200000>;
                                read-only;
                        };
 
-                       partition@580000 {
+                       partition@5c0000 {
                                label = "ubi";
-                               reg = <0x5C0000 0x4000000>;
+                               reg = <0x5c0000 0x4000000>;
                                compatible = "linux,ubi";
                        };
                };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
index cf2f79b40770f9c5858d1ca9156cfa5abd73e5c7..ccefc1926c518e40d140619c6f879e584cf03b99 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000s-v1.dts
@@ -165,6 +165,7 @@
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -180,6 +181,7 @@
                                label = "bdinfo";
                                reg = <0x380000 0x0040000>;
                                read-only;
+
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -193,15 +195,15 @@
                                };
                        };
 
-                       partition@3C0000 {
+                       partition@3c0000 {
                                label = "FIP";
-                               reg = <0x3C0000 0x0200000>;
+                               reg = <0x3c0000 0x0200000>;
                                read-only;
                        };
 
-                       partition@580000 {
+                       partition@5c0000 {
                                label = "ubi";
-                               reg = <0x5C0000 0x4000000>;
+                               reg = <0x5c0000 0x4000000>;
                                compatible = "linux,ubi";
                        };
                };