diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2024-04-12 13:24:38 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2024-04-13 18:49:30 +0100 |
| commit | eb13076e77c412cfe4dd6de48138507ea6f3c8b3 (patch) | |
| tree | 89d63b114aa60a7028b6e425a351f7d05c3c0e34 /target/linux/mediatek | |
| parent | c08f8a4a4913d80ed3fb261dadc711e94b8428dd (diff) | |
| download | openwrt-eb13076e77c412cfe4dd6de48138507ea6f3c8b3.tar.gz openwrt-eb13076e77c412cfe4dd6de48138507ea6f3c8b3.tar.bz2 openwrt-eb13076e77c412cfe4dd6de48138507ea6f3c8b3.zip | |
mediatek: fix DTS defining mt7530 switch phys but not referencing them
The upstream solution to define the MDIO bus in DT is a bit
more strict than our previous downstream solution doing the same thing
and now requires switch PHYs to be referenced in DT as well.
Arınç Ünal told us in #15141:
"With [the now upstream patch written by him which we backported], the
switch MDIO bus won't be assigned to ds->user_mii_bus when the switch
MDIO bus is defined on the device tree anymore. This was not the case
with the downstream patch.
When ds->user_mii_bus is populated, DSA will 1:1 map the port with
PHY. Meaning port with address 1 will be mapped to PHY with address 1.
Because that ds->user_mii_bus is not populated when the switch MDIO
bus is defined on the device tree, on every port node, the PHY address
must be supplied by the phy-handle property."
Add those phy-handles to affected devices' DT.
Fixes: 4354b34f6f ("generic: 6.6: sync mt7530 DSA driver with upstream")
Fixes: 401a6ccfaf ("generic: 6.1: sync mt7530 DSA driver with upstream")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts | 12 | ||||
| -rw-r--r-- | target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts | 12 | ||||
| -rw-r--r-- | target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts | 12 |
3 files changed, 24 insertions, 12 deletions
diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts index 6bff786558..612f3c7334 100644 --- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts +++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts @@ -348,21 +348,25 @@ port@0 { reg = <0>; label = "game"; + phy-handle = <&swphy0>; }; port@1 { reg = <1>; label = "lan1"; + phy-handle = <&swphy1>; }; port@2 { reg = <2>; label = "lan2"; + phy-handle = <&swphy2>; }; port@3 { reg = <3>; label = "lan3"; + phy-handle = <&swphy3>; }; port@6 { @@ -383,7 +387,7 @@ #address-cells = <1>; #size-cells = <0>; - phy@0 { + swphy0: phy@0 { reg = <0>; mediatek,led-config = < @@ -397,7 +401,7 @@ >; }; - phy@1 { + swphy1: phy@1 { reg = <1>; mediatek,led-config = < @@ -411,7 +415,7 @@ >; }; - phy@2 { + swphy2: phy@2 { reg = <2>; mediatek,led-config = < @@ -425,7 +429,7 @@ >; }; - phy@3 { + swphy3: phy@3 { reg = <3>; mediatek,led-config = < diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts index 22530df9bb..e40602fa21 100644 --- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts +++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts @@ -286,21 +286,25 @@ port@1 { reg = <1>; label = "lan1"; + phy-handle = <&swphy1>; }; port@2 { reg = <2>; label = "lan2"; + phy-handle = <&swphy2>; }; port@3 { reg = <3>; label = "lan3"; + phy-handle = <&swphy3>; }; port@4 { reg = <4>; label = "lan4"; + phy-handle = <&swphy4>; }; port@6 { @@ -321,7 +325,7 @@ #address-cells = <1>; #size-cells = <0>; - phy@1 { + swphy1: phy@1 { reg = <1>; mediatek,led-config = < @@ -335,7 +339,7 @@ >; }; - phy@2 { + swphy2: phy@2 { reg = <2>; mediatek,led-config = < @@ -349,7 +353,7 @@ >; }; - phy@3 { + swphy3: phy@3 { reg = <3>; mediatek,led-config = < @@ -363,7 +367,7 @@ >; }; - phy@4 { + swphy4: phy@4 { reg = <4>; mediatek,led-config = < diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts index bde2525cd7..1cdfb5f155 100644 --- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts +++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts @@ -298,21 +298,25 @@ port@1 { reg = <4>; label = "lan1"; + phy-handle = <&swphy1>; }; port@2 { reg = <3>; label = "lan2"; + phy-handle = <&swphy2>; }; port@3 { reg = <2>; label = "lan3"; + phy-handle = <&swphy3>; }; port@4 { reg = <1>; label = "lan4"; + phy-handle = <&swphy4>; }; port@5 { @@ -341,7 +345,7 @@ #address-cells = <1>; #size-cells = <0>; - phy@1 { + swphy1: phy@1 { reg = <1>; mediatek,led-config = < @@ -355,7 +359,7 @@ >; }; - phy@2 { + swphy2: phy@2 { reg = <2>; mediatek,led-config = < @@ -369,7 +373,7 @@ >; }; - phy@3 { + swphy3: phy@3 { reg = <3>; mediatek,led-config = < @@ -383,7 +387,7 @@ >; }; - phy@4 { + swphy4: phy@4 { reg = <4>; mediatek,led-config = < |