Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c274e5f0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "STMMAC: msm: Add io macro setting for 10Mpbs"

parents df52b0fe e17d5f18

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+4 −2
Original line number Diff line number Diff line
@@ -762,7 +762,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
				      0, RGMII_IO_MACRO_CONFIG2);

		if (ethqos->emac_ver == EMAC_HW_v2_3_2_RG ||

		    ethqos->emac_ver == EMAC_HW_v2_1_2 ||

			ethqos->emac_ver == EMAC_HW_v2_1_1)

			ethqos->emac_ver == EMAC_HW_v2_1_1 ||

			ethqos->emac_ver == EMAC_HW_v2_3_1)

			rgmii_updatel(ethqos,

				      RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,

				      RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
@@ -778,7 +779,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
			      0, RGMII_IO_MACRO_CONFIG2);

		if (ethqos->emac_ver == EMAC_HW_v2_3_2_RG ||

		    ethqos->emac_ver == EMAC_HW_v2_1_2 ||

			ethqos->emac_ver == EMAC_HW_v2_1_1)

			ethqos->emac_ver == EMAC_HW_v2_1_1 ||

			ethqos->emac_ver == EMAC_HW_v2_3_1)

			rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,

				      RGMII_CONFIG2_RX_PROG_SWAP,

				      RGMII_IO_MACRO_CONFIG2);