From e7bd136138ee18022ff4331d36c7fb17e60f95a1 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 10 May 2023 23:19:07 +0800 Subject: [PATCH] mediate: filogic: sync upstream dts changes --- ...dtsi => mt7986a-tplink-tl-xdr-common.dtsi} | 40 +++++++++++-------- ...4288.dts => mt7986a-tplink-tl-xdr4288.dts} | 10 ++--- ...6086.dts => mt7986a-tplink-tl-xdr6086.dts} | 2 +- ...6088.dts => mt7986a-tplink-tl-xdr6088.dts} | 10 ++--- .../mt7986a-xiaomi-redmi-router-ax6000.dts | 15 ++++--- .../filogic/base-files/etc/board.d/02_network | 20 +++++----- .../etc/hotplug.d/ieee80211/11_fix_wifi_mac | 5 +++ target/linux/mediatek/image/filogic.mk | 6 +-- 8 files changed, 60 insertions(+), 48 deletions(-) rename target/linux/mediatek/dts/{mt7986a-tl-xdr-common.dtsi => mt7986a-tplink-tl-xdr-common.dtsi} (93%) rename target/linux/mediatek/dts/{mt7986a-tl-xdr4288.dts => mt7986a-tplink-tl-xdr4288.dts} (96%) rename target/linux/mediatek/dts/{mt7986a-tl-xdr6086.dts => mt7986a-tplink-tl-xdr6086.dts} (96%) rename target/linux/mediatek/dts/{mt7986a-tl-xdr6088.dts => mt7986a-tplink-tl-xdr6088.dts} (96%) diff --git a/target/linux/mediatek/dts/mt7986a-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi similarity index 93% rename from target/linux/mediatek/dts/mt7986a-tl-xdr-common.dtsi rename to target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi index 6cd3ec379..cf04e0f12 100644 --- a/target/linux/mediatek/dts/mt7986a-tl-xdr-common.dtsi +++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi @@ -9,10 +9,10 @@ aliases { serial0 = &uart0; label-mac-device = &gmac0; - led-boot = &led_status_red; + led-boot = &led_status_green; led-failsafe = &led_status_red; led-running = &led_status_green; - led-upgrade = &led_status_green; + led-upgrade = &led_status_red; }; chosen { @@ -119,7 +119,27 @@ }; &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"; reg = <31>; reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; @@ -128,20 +148,6 @@ interrupt-parent = <&pio>; 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 { diff --git a/target/linux/mediatek/dts/mt7986a-tl-xdr4288.dts b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr4288.dts similarity index 96% rename from target/linux/mediatek/dts/mt7986a-tl-xdr4288.dts rename to target/linux/mediatek/dts/mt7986a-tplink-tl-xdr4288.dts index 4a7fd23da..ce2b60eaa 100644 --- a/target/linux/mediatek/dts/mt7986a-tl-xdr4288.dts +++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr4288.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7986a-tl-xdr-common.dtsi" +#include "mt7986a-tplink-tl-xdr-common.dtsi" / { model = "TP-Link TL-XDR4288"; @@ -15,22 +15,22 @@ port@0 { reg = <0>; - label = "lan1"; + label = "lan4"; }; port@1 { reg = <1>; - label = "lan2"; + label = "lan3"; }; port@2 { reg = <2>; - label = "lan3"; + label = "lan2"; }; port@3 { reg = <3>; - label = "lan4"; + label = "lan1"; }; port@5 { diff --git a/target/linux/mediatek/dts/mt7986a-tl-xdr6086.dts b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6086.dts similarity index 96% rename from target/linux/mediatek/dts/mt7986a-tl-xdr6086.dts rename to target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6086.dts index ad1d3be24..3b1d3b3db 100644 --- a/target/linux/mediatek/dts/mt7986a-tl-xdr6086.dts +++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6086.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7986a-tl-xdr-common.dtsi" +#include "mt7986a-tplink-tl-xdr-common.dtsi" / { model = "TP-Link TL-XDR6086"; diff --git a/target/linux/mediatek/dts/mt7986a-tl-xdr6088.dts b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6088.dts similarity index 96% rename from target/linux/mediatek/dts/mt7986a-tl-xdr6088.dts rename to target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6088.dts index a5f5d0fb7..a59e85cb7 100644 --- a/target/linux/mediatek/dts/mt7986a-tl-xdr6088.dts +++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr6088.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7986a-tl-xdr-common.dtsi" +#include "mt7986a-tplink-tl-xdr-common.dtsi" / { model = "TP-Link TL-XDR6088"; @@ -15,22 +15,22 @@ port@0 { reg = <0>; - label = "lan1"; + label = "lan4"; }; port@1 { reg = <1>; - label = "lan2"; + label = "lan3"; }; port@2 { reg = <2>; - label = "lan3"; + label = "lan2"; }; port@3 { reg = <3>; - label = "lan4"; + label = "lan1"; }; port@5 { diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts index 2da43ec6e..50926ea61 100644 --- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts +++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts @@ -137,15 +137,14 @@ #size-cells = <1>; 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-tx-buswidth = <4>; spi-rx-buswidth = <4>; + mediatek,nmbm; + mediatek,bmt-max-ratio = <1>; + mediatek,bmt-max-reserved-blocks = <64>; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -250,17 +249,17 @@ port@1 { reg = <1>; - label = "lan1"; + label = "lan4"; }; port@2 { reg = <2>; - label = "lan2"; + label = "lan3"; }; port@3 { reg = <3>; - label = "lan3"; + label = "lan2"; }; port@4 { diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network index 5202de26d..fb5df853f 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network @@ -9,19 +9,18 @@ mediatek_setup_interfaces() case $board in 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,mt7986b-rfb) 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-xdr6088) 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 ;; 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 @@ -52,6 +51,9 @@ mediatek_setup_macs() wan_mac="${addr}" lan_mac="${addr}" ;; + bananapi,bpi-r3) + wan_mac=$(macaddr_add $(cat /sys/class/net/eth0/address) 1) + ;; xiaomi,redmi-router-ax6000) wan_mac=$(mtd_get_mac_ascii Bdata ethaddr_wan) label_mac=$wan_mac diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 8183ddd6f..e2be15695 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -19,6 +19,11 @@ case "$board" in [ "$PHYNBR" = "0" ] && macaddr_setbit_la $(macaddr_add $addr 1) > /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-xdr6086|\ tplink,tl-xdr6088) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 1c5e7e88e..704c4a208 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -168,21 +168,21 @@ endef define Device/tplink_tl-xdr4288 DEVICE_MODEL := TL-XDR4288 - DEVICE_DTS := mt7986a-tl-xdr4288 + DEVICE_DTS := mt7986a-tplink-tl-xdr4288 $(call Device/tplink_tl-common) endef TARGET_DEVICES += tplink_tl-xdr4288 define Device/tplink_tl-xdr6086 DEVICE_MODEL := TL-XDR6086 - DEVICE_DTS := mt7986a-tl-xdr6086 + DEVICE_DTS := mt7986a-tplink-tl-xdr6086 $(call Device/tplink_tl-common) endef TARGET_DEVICES += tplink_tl-xdr6086 define Device/tplink_tl-xdr6088 DEVICE_MODEL := TL-XDR6088 - DEVICE_DTS := mt7986a-tl-xdr6088 + DEVICE_DTS := mt7986a-tplink-tl-xdr6088 $(call Device/tplink_tl-common) endef TARGET_DEVICES += tplink_tl-xdr6088