Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mediatek: filogic: wax220: cleanup device tree

Browse source 
Fix compatible string to match what is supported upstream, fix alignment
and order MTD partitions according to offset.

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2023-06-30 12:34:38 +02:00 committed by David Bauer
parent fa9d977f97
commit 4af06aaf33
2 changed files with 59 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/boot/uboot-envtools/files/mediatek_filogic
View file

@ -45,7 +45,7 @@ mercusys,mr90x-v1)
ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1" ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
;; ;;
netgear,wax220) netgear,wax220)
ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x20000" "0x20000" ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
;; ;;
xiaomi,mi-router-wr30u-112m-nmbm|\ xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-stock|\ xiaomi,mi-router-wr30u-stock|\

121
target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
View file

@ -8,10 +8,8 @@
#include "mt7986b.dtsi" #include "mt7986b.dtsi"
/ { / {
#address-cells = <0x2>;
#size-cells = <0x2>;
model = "Netgear WAX220"; model = "Netgear WAX220";
compatible = "netgear,wax220", "mediatek,mt7986b-spim-snand-rfb"; compatible = "netgear,wax220", "mediatek,mt7986b";
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
@ -106,8 +104,6 @@
}; };
&mdio { &mdio {
#address-cells = <1>;
#size-cells = <0>;
phy6: ethernet-phy@6 { phy6: ethernet-phy@6 {
reg = <6>; reg = <6>;
reset-assert-us = <100000>; reset-assert-us = <100000>;
@ -120,7 +116,6 @@
}; };
}; };
&pio { &pio {
spi_flash_pins: spi-flash-pins-33-to-38 { spi_flash_pins: spi-flash-pins-33-to-38 {
mux { mux {
@ -145,13 +140,13 @@
groups = "wf_2g", "wf_5g"; groups = "wf_2g", "wf_5g";
}; };
conf { conf {
pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
"WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
"WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
"WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
"WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
"WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
"WF1_TOP_CLK", "WF1_TOP_DATA"; "WF1_TOP_CLK", "WF1_TOP_DATA";
drive-strength = <4>; drive-strength = <4>;
}; };
}; };
@ -163,9 +158,9 @@
}; };
conf { conf {
pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
"WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
"WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
"WF0_TOP_CLK", "WF0_TOP_DATA"; "WF0_TOP_CLK", "WF0_TOP_DATA";
drive-strength = <4>; drive-strength = <4>;
}; };
}; };
@ -196,29 +191,10 @@
#size-cells = <0x1>; #size-cells = <0x1>;
compatible = "fixed-partitions"; compatible = "fixed-partitions";
partition@5fc0000 { partition@0 {
label = "Traffic"; label = "BL2";
reg = <0x5fc0000 0x200000>; read-only;
}; reg = <0x0 0x100000>;
partition@63c0000 {
label = "NTGRcryptD";
reg = <0x63c0000 0x500000>;
};
partition@580000 {
label = "ubi";
reg = <0x580000 0x5140000>;
};
factory: partition@180000 {
label = "Factory";
reg = <0x180000 0x200000>;
};
partition@69c0000 {
label = "User_data";
reg = <0x69c0000 0x640000>;
}; };
partition@100000 { partition@100000 {
@ -226,30 +202,9 @@
reg = <0x100000 0x80000>; reg = <0x100000 0x80000>;
}; };
partition@68c0000 { factory: partition@180000 {
label = "LOG"; label = "Factory";
reg = <0x68c0000 0x100000>; reg = <0x180000 0x200000>;
};
partition@5ac0000 {
label = "POT";
reg = <0x5ac0000 0x100000>;
};
partition@0 {
label = "BL2";
read-only;
reg = <0x0 0x100000>;
};
partition@5bc0000 {
label = "Language";
reg = <0x5bc0000 0x400000>;
};
partition@61c0000 {
label = "Cert";
reg = <0x61c0000 0x100000>;
}; };
partition@380000 { partition@380000 {
@ -257,15 +212,55 @@
reg = <0x380000 0x200000>; reg = <0x380000 0x200000>;
}; };
partition@580000 {
label = "ubi";
reg = <0x580000 0x5140000>;
};
partition@56c0000 { partition@56c0000 {
label = "RAE"; label = "RAE";
reg = <0x56c0000 0x400000>; reg = <0x56c0000 0x400000>;
}; };
partition@5ac0000 {
label = "POT";
reg = <0x5ac0000 0x100000>;
};
partition@5bc0000 {
label = "Language";
reg = <0x5bc0000 0x400000>;
};
partition@5fc0000 {
label = "Traffic";
reg = <0x5fc0000 0x200000>;
};
partition@61c0000 {
label = "Cert";
reg = <0x61c0000 0x100000>;
};
partition@62c0000 { partition@62c0000 {
label = "NTGRcryptK"; label = "NTGRcryptK";
reg = <0x62c0000 0x100000>; reg = <0x62c0000 0x100000>;
}; };
partition@63c0000 {
label = "NTGRcryptD";
reg = <0x63c0000 0x500000>;
};
partition@68c0000 {
label = "LOG";
reg = <0x68c0000 0x100000>;
};
partition@69c0000 {
label = "User_data";
reg = <0x69c0000 0x640000>;
};
}; };
}; };