diff options
| author | Chukun Pan | 2024-12-03 15:02:15 +0000 |
|---|---|---|
| committer | Chukun Pan | 2025-01-23 02:28:20 +0000 |
| commit | ab375a3484db67857450ced461498ad3d7942e05 (patch) | |
| tree | 4b1f96d95f2d687fcc96924a3221e106ae7d39c3 | |
| parent | 2f2e21a52bdfdcf83868e3169768fda134aa883b (diff) | |
| download | openwrt-ab375a3484db67857450ced461498ad3d7942e05.tar.gz | |
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>
6 files changed, 33 insertions, 29 deletions
diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000-v1.dts index bd6c15225b..7101c4bab0 100644 --- 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 a1eb9c6e1e..2e84d2b538 100644 --- 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 85bdabe474..b1797157ac 100644 --- 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 1f03b42b1b..31a2cf5194 100644 --- 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 0808eb9557..1bf166e0bf 100644 --- 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 cf2f79b407..ccefc1926c 100644 --- 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"; }; }; |