Shikra integrates two Qualcomm ETHQOS controllers based on the Synopsys GMAC IP, similar to previous platforms. Register qcom,shikra-ethqos backed by a new shikra_data descriptor that enables the three NOC clocks required for DMA memory access (stmmaceth, axi-noc, pcie-tile-axi-noc), and the 36-bit DMA address width. Set the NOC clock rates through an OPP table to ensure proper voting of the VDD_CX power domain. The stmmac core enables stmmaceth before the glue driver applies the OPP vote, both at probe and on resume. This is safe because VDD_CX only needs to be voted while DMA traffic is ongoing, which cannot start until the glue driver applies the vote. Shikra's intended rgmii-id configuration supplies both TX and RX delays in the PHY. Therefore, enable phy_managed_delays to select the DLL-bypass sequence. No POR table is needed for this intended bypass operation. Signed-off-by: Mohd Ayaan Anwar --- v4: set phy_managed_delays to true for Shikra and reworded the commit message to clarify concerns raised by Sashiko. --- .../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 15385750b3e6..a7fdba73da2b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -332,6 +332,24 @@ static const struct ethqos_emac_driver_data emac_v4_0_0_scmi_data = { .setup = ethqos_scmi_setup, }; +static const char * const shikra_noc_clk_names[] = { + "stmmaceth", + "axi-noc", + "pcie-tile-axi-noc", + NULL, +}; + +static const struct ethqos_emac_driver_data shikra_data = { + .dma_addr_width = 36, + .has_emac_ge_3 = true, + .noc_clk_names = shikra_noc_clk_names, + .num_noc_clks = ARRAY_SIZE(shikra_noc_clk_names) - 1, + .rgmii_config_loopback_en = false, + .phy_managed_delays = true, + .dwmac4_addrs = ðqos_dwmac4_addrs, + .setup = ethqos_hlos_setup, +}; + static int ethqos_dll_configure(struct qcom_ethqos *ethqos) { struct device *dev = ðqos->pdev->dev; @@ -1101,6 +1119,7 @@ static const struct of_device_id qcom_ethqos_match[] = { { .compatible = "qcom,sa8255p-ethqos", .data = &emac_v4_0_0_scmi_data}, { .compatible = "qcom,sa8775p-ethqos", .data = &emac_v4_0_0_data}, { .compatible = "qcom,sc8280xp-ethqos", .data = &emac_v3_0_0_data}, + { .compatible = "qcom,shikra-ethqos", .data = &shikra_data}, { .compatible = "qcom,sm8150-ethqos", .data = &emac_v2_1_0_data}, { } }; -- 2.34.1