mediate: filogic: sync upstream dts changes

This commit is contained in:
AmadeusGhost 2023-05-10 23:19:07 +08:00
parent 3e35e07760
commit e7bd136138
8 changed files with 60 additions and 48 deletions

View File

@ -9,10 +9,10 @@
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
label-mac-device = &gmac0; label-mac-device = &gmac0;
led-boot = &led_status_red; led-boot = &led_status_green;
led-failsafe = &led_status_red; led-failsafe = &led_status_red;
led-running = &led_status_green; led-running = &led_status_green;
led-upgrade = &led_status_green; led-upgrade = &led_status_red;
}; };
chosen { chosen {
@ -119,7 +119,27 @@
}; };
&mdio { &mdio {
switch: switch@0 { phy5: ethernet-phy@5 {
compatible = "ethernet-phy-ieee802.3-c45";
reg = <5>;
reset-assert-us = <100000>;
reset-deassert-us = <100000>;
reset-gpios = <&pio 13 GPIO_ACTIVE_LOW>;
realtek,aldps-enable;
realtek,led-link-select = <0xa7 0x0 0x0>;
};
phy7: ethernet-phy@7 {
compatible = "ethernet-phy-ieee802.3-c45";
reg = <7>;
reset-assert-us = <100000>;
reset-deassert-us = <100000>;
reset-gpios = <&pio 17 GPIO_ACTIVE_LOW>;
realtek,aldps-enable;
realtek,led-link-select = <0xa7 0x0 0x0>;
};
switch: switch@31 {
compatible = "mediatek,mt7531"; compatible = "mediatek,mt7531";
reg = <31>; reg = <31>;
reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
@ -128,20 +148,6 @@
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <66 IRQ_TYPE_LEVEL_HIGH>; interrupts = <66 IRQ_TYPE_LEVEL_HIGH>;
}; };
phy5: ethernet-phy@5 {
reg = <5>;
reset-assert-us = <100000>;
reset-deassert-us = <100000>;
reset-gpios = <&pio 13 GPIO_ACTIVE_LOW>;
};
phy7: ethernet-phy@7 {
reg = <7>;
reset-assert-us = <100000>;
reset-deassert-us = <100000>;
reset-gpios = <&pio 17 GPIO_ACTIVE_LOW>;
};
}; };
&spi0 { &spi0 {

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7986a-tl-xdr-common.dtsi" #include "mt7986a-tplink-tl-xdr-common.dtsi"
/ { / {
model = "TP-Link TL-XDR4288"; model = "TP-Link TL-XDR4288";
@ -15,22 +15,22 @@
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "lan1"; label = "lan4";
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
label = "lan2"; label = "lan3";
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan3"; label = "lan2";
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan4"; label = "lan1";
}; };
port@5 { port@5 {

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7986a-tl-xdr-common.dtsi" #include "mt7986a-tplink-tl-xdr-common.dtsi"
/ { / {
model = "TP-Link TL-XDR6086"; model = "TP-Link TL-XDR6086";

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "mt7986a-tl-xdr-common.dtsi" #include "mt7986a-tplink-tl-xdr-common.dtsi"
/ { / {
model = "TP-Link TL-XDR6088"; model = "TP-Link TL-XDR6088";
@ -15,22 +15,22 @@
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "lan1"; label = "lan4";
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
label = "lan2"; label = "lan3";
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan3"; label = "lan2";
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan4"; label = "lan1";
}; };
port@5 { port@5 {

View File

@ -137,15 +137,14 @@
#size-cells = <1>; #size-cells = <1>;
reg = <0>; reg = <0>;
mediatek,nmbm;
mediatek,bmt-max-ratio = <1>;
mediatek,bmt-max-reserved-blocks = <64>;
mediatek,bmt-remap-range = <0x0 0x600000>;
spi-max-frequency = <20000000>; spi-max-frequency = <20000000>;
spi-tx-buswidth = <4>; spi-tx-buswidth = <4>;
spi-rx-buswidth = <4>; spi-rx-buswidth = <4>;
mediatek,nmbm;
mediatek,bmt-max-ratio = <1>;
mediatek,bmt-max-reserved-blocks = <64>;
partitions { partitions {
compatible = "fixed-partitions"; compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;
@ -250,17 +249,17 @@
port@1 { port@1 {
reg = <1>; reg = <1>;
label = "lan1"; label = "lan4";
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan2"; label = "lan3";
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan3"; label = "lan2";
}; };
port@4 { port@4 {

View File

@ -9,19 +9,18 @@ mediatek_setup_interfaces()
case $board in case $board in
asus,tuf-ax4200) asus,tuf-ax4200)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth1" ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1
;;
bananapi,bpi-r3)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
;;
glinet,gl-mt3000)
ucidef_set_interfaces_lan_wan eth1 eth0
;; ;;
mediatek,mt7986a-rfb|\ mediatek,mt7986a-rfb|\
mediatek,mt7986b-rfb) mediatek,mt7986b-rfb)
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1 ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1
;; ;;
bananapi,bpi-r3)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
ucidef_set_interface_macaddr "wan" "$(macaddr_add $(cat /sys/class/net/eth0/address) 1)"
;;
glinet,gl-mt3000)
ucidef_set_interfaces_lan_wan eth1 eth0
;;
tplink,tl-xdr4288|\ tplink,tl-xdr4288|\
tplink,tl-xdr6088) tplink,tl-xdr6088)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
@ -30,7 +29,7 @@ mediatek_setup_interfaces()
ucidef_set_interfaces_lan_wan "lan1 lan2" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2" eth1
;; ;;
xiaomi,redmi-router-ax6000) xiaomi,redmi-router-ax6000)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan
;; ;;
*) *)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
@ -52,6 +51,9 @@ mediatek_setup_macs()
wan_mac="${addr}" wan_mac="${addr}"
lan_mac="${addr}" lan_mac="${addr}"
;; ;;
bananapi,bpi-r3)
wan_mac=$(macaddr_add $(cat /sys/class/net/eth0/address) 1)
;;
xiaomi,redmi-router-ax6000) xiaomi,redmi-router-ax6000)
wan_mac=$(mtd_get_mac_ascii Bdata ethaddr_wan) wan_mac=$(mtd_get_mac_ascii Bdata ethaddr_wan)
label_mac=$wan_mac label_mac=$wan_mac

View File

@ -19,6 +19,11 @@ case "$board" in
[ "$PHYNBR" = "0" ] && macaddr_setbit_la $(macaddr_add $addr 1) > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "0" ] && macaddr_setbit_la $(macaddr_add $addr 1) > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && echo "$addr" > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && echo "$addr" > /sys${DEVPATH}/macaddress
;; ;;
bananapi,bpi-r3)
addr=$(macaddr_add $(cat /sys/class/net/eth0/address) 2)
[ "$PHYNBR" = "0" ] && macaddr_unsetbit $addr 6 > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && macaddr_setbit $addr 6 > /sys${DEVPATH}/macaddress
;;
tplink,tl-xdr4288|\ tplink,tl-xdr4288|\
tplink,tl-xdr6086|\ tplink,tl-xdr6086|\
tplink,tl-xdr6088) tplink,tl-xdr6088)

View File

@ -168,21 +168,21 @@ endef
define Device/tplink_tl-xdr4288 define Device/tplink_tl-xdr4288
DEVICE_MODEL := TL-XDR4288 DEVICE_MODEL := TL-XDR4288
DEVICE_DTS := mt7986a-tl-xdr4288 DEVICE_DTS := mt7986a-tplink-tl-xdr4288
$(call Device/tplink_tl-common) $(call Device/tplink_tl-common)
endef endef
TARGET_DEVICES += tplink_tl-xdr4288 TARGET_DEVICES += tplink_tl-xdr4288
define Device/tplink_tl-xdr6086 define Device/tplink_tl-xdr6086
DEVICE_MODEL := TL-XDR6086 DEVICE_MODEL := TL-XDR6086
DEVICE_DTS := mt7986a-tl-xdr6086 DEVICE_DTS := mt7986a-tplink-tl-xdr6086
$(call Device/tplink_tl-common) $(call Device/tplink_tl-common)
endef endef
TARGET_DEVICES += tplink_tl-xdr6086 TARGET_DEVICES += tplink_tl-xdr6086
define Device/tplink_tl-xdr6088 define Device/tplink_tl-xdr6088
DEVICE_MODEL := TL-XDR6088 DEVICE_MODEL := TL-XDR6088
DEVICE_DTS := mt7986a-tl-xdr6088 DEVICE_DTS := mt7986a-tplink-tl-xdr6088
$(call Device/tplink_tl-common) $(call Device/tplink_tl-common)
endef endef
TARGET_DEVICES += tplink_tl-xdr6088 TARGET_DEVICES += tplink_tl-xdr6088