Commit c9b96eb6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Update-MT7629-to-support-PHYLINK-API' 



MarkLee says:

====================
Update MT7629 to support PHYLINK API

This patch set has two goals :
	1. Fix mt7629 GMII mode issue after apply mediatek
	   PHYLINK support patch.
	2. Update mt7629 dts to reflect the latest dt-binding
	   with PHYLINK support.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8d045995 2618500d

arch/arm/boot/dts/mt7629-rfb.dts

+12 −1
Original line number Diff line number Diff line
@@ -66,9 +66,21 @@ 
	pinctrl-1 = <&ephy_leds_pins>;

	status = "okay";



	gmac0: mac@0 {

		compatible = "mediatek,eth-mac";

		reg = <0>;

		phy-mode = "2500base-x";

		fixed-link {

			speed = <2500>;

			full-duplex;

			pause;

		};

	};



	gmac1: mac@1 {

		compatible = "mediatek,eth-mac";

		reg = <1>;

		phy-mode = "gmii";

		phy-handle = <&phy0>;

	};
@@ -78,7 +90,6 @@ 


		phy0: ethernet-phy@0 {

			reg = <0>;

			phy-mode = "gmii";

		};

	};

};

arch/arm/boot/dts/mt7629.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -468,14 +468,12 @@ 
			compatible = "mediatek,mt7629-sgmiisys", "syscon";

			reg = <0x1b128000 0x3000>;

			#clock-cells = <1>;

			mediatek,physpeed = "2500";

		};



		sgmiisys1: syscon@1b130000 {

			compatible = "mediatek,mt7629-sgmiisys", "syscon";

			reg = <0x1b130000 0x3000>;

			#clock-cells = <1>;

			mediatek,physpeed = "2500";

		};

	};

};

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode, 
		ge_mode = 0;

		switch (state->interface) {

		case PHY_INTERFACE_MODE_MII:

		case PHY_INTERFACE_MODE_GMII:

			ge_mode = 1;

			break;

		case PHY_INTERFACE_MODE_REVMII:

CRA Git | Maintained and supported by SUSTech CRA and CCSE