Unverified Commit dc00a9fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-6.18-fixes-0' of... 

Merge tag 'aspeed-6.18-fixes-0' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux into arm/fixes

First batch of ASPEED fixes for 6.18

This time it's just the one fix addressing a PHY configuration regression in the
Fuji (Meta) platform's mac3 devicetree node.

* tag 'aspeed-6.18-fixes-0' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux

:
  ARM: dts: aspeed: fuji-data64: Enable mac3 controller

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3e40c919 85893094

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

+14 −0
Original line number Diff line number Diff line
@@ -1254,3 +1254,17 @@ &emmc { 
	max-frequency = <25000000>;

	bus-width = <4>;

};



/*

 * FIXME: rgmii delay is introduced by MAC (configured in u-boot now)

 * instead of PCB on fuji board, so the "phy-mode" should be updated to

 * "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay

 * properly.

 */

&mac3 {

	status = "okay";

	phy-mode = "rgmii";

	phy-handle = <&ethphy3>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii4_default>;

};