Skip to content

Commit 8589309

Browse files
tao-renamboar
authored andcommitted
ARM: dts: aspeed: fuji-data64: Enable mac3 controller
"mac3" controller was removed from the initial version of fuji-data64 dts because the rgmii setting is incorrect, but dropping mac3 leads to regression in the existing fuji platform, because fuji.dts simply includes fuji-data64.dts. This patch adds mac3 back to fuji-data64.dts to fix the fuji regression[1], and rgmii settings need to be fixed later. Fixes: b0f294f ("ARM: dts: aspeed: facebook-fuji: Include facebook-fuji-data64.dts") Link: https://lore.kernel.org/all/79ddc7b9-ef26-4959-9a16-aa4e006eb145@roeck-us.net/ [1] Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
1 parent 3a86608 commit 8589309

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,3 +1254,17 @@
12541254
max-frequency = <25000000>;
12551255
bus-width = <4>;
12561256
};
1257+
1258+
/*
1259+
* FIXME: rgmii delay is introduced by MAC (configured in u-boot now)
1260+
* instead of PCB on fuji board, so the "phy-mode" should be updated to
1261+
* "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay
1262+
* properly.
1263+
*/
1264+
&mac3 {
1265+
status = "okay";
1266+
phy-mode = "rgmii";
1267+
phy-handle = <&ethphy3>;
1268+
pinctrl-names = "default";
1269+
pinctrl-0 = <&pinctrl_rgmii4_default>;
1270+
};

0 commit comments

Comments
 (0)