From 2335930689dc3db5c870fd6b0db707639fde58f9 Mon Sep 17 00:00:00 2001 From: Suraj Jaiswal Date: Mon, 28 Sep 2020 13:44:10 +0530 Subject: [PATCH] STMMAC: msm: Add io macro settings for emac core version 2.1.1 IO macro setting for 2.1.1 Change-Id: I5172cde7fc423481f07d4eb60b32f66400aec0a6 Acked-by: Nagarjuna Chaganti Signed-off-by: Suraj Jaiswal --- .../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index f324ac0655ad..dac46f351ee7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -487,6 +487,9 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) else if (ethqos->emac_ver == EMAC_HW_v2_1_2) rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY, 52, SDCC_HC_REG_DDR_CONFIG); + 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 rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY, 57, SDCC_HC_REG_DDR_CONFIG); @@ -524,7 +527,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, 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_2 || + ethqos->emac_ver == EMAC_HW_v2_1_1) rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, RGMII_CONFIG2_RX_PROG_SWAP, RGMII_IO_MACRO_CONFIG2); @@ -564,7 +568,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL, 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_2 || + ethqos->emac_ver == EMAC_HW_v2_1_1) rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, @@ -579,7 +584,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, 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_2 || + ethqos->emac_ver == EMAC_HW_v2_1_1) rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, RGMII_CONFIG2_RX_PROG_SWAP, RGMII_IO_MACRO_CONFIG2);