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

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

Merge "STMMAC: msm: Add io macro setting for SA6155"

parents bfb176a7 327eeaac

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

+5 −1
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
		else if (ethqos->emac_ver == EMAC_HW_v2_1_1)

			rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,

				      130, SDCC_HC_REG_DDR_CONFIG);

		else if (ethqos->emac_ver == EMAC_HW_v2_3_1)

			rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,

				      104, SDCC_HC_REG_DDR_CONFIG);

		else

			rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,

				      57, SDCC_HC_REG_DDR_CONFIG);
@@ -541,7 +544,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);