@@ -313,6 +313,8 @@ static int tegra_eqos_probe(struct platform_device *pdev,
if (err < 0)
goto error;
+ data->stmmac_clk = eqos->clk_master;
+
eqos->clk_slave = devm_clk_get(&pdev->dev, "slave_bus");
if (IS_ERR(eqos->clk_slave)) {
err = PTR_ERR(eqos->clk_slave);
@@ -323,7 +325,7 @@ static int tegra_eqos_probe(struct platform_device *pdev,
if (err < 0)
goto disable_master;
- data->stmmac_clk = eqos->clk_slave;
+ data->pclk = eqos->clk_slave;
eqos->reset = devm_gpiod_get(&pdev->dev, "phy-reset", GPIOD_OUT_HIGH);
if (IS_ERR(eqos->reset)) {
@@ -371,9 +373,10 @@ static int tegra_eqos_probe(struct platform_device *pdev,
gpiod_set_value(eqos->reset, 1);
disable_slave:
clk_disable_unprepare(eqos->clk_slave);
- data->stmmac_clk = NULL;
+ data->pclk = NULL;
disable_master:
clk_disable_unprepare(eqos->clk_master);
+ data->stmmac_clk = NULL;
error:
return err;
}
@@ -392,6 +395,7 @@ static int tegra_eqos_remove(struct platform_device *pdev)
* data so the stmmac_remove_config_dt() method wouldn't have disabled
* the clocks too.
*/
+ priv->plat->pclk = NULL;
priv->plat->stmmac_clk = NULL;
return 0;
Currently the "master_bus" clock of the DW QoS Eth controller isn't preserved in the STMMAC platform data, while the "slave_bus" clock is assigned to the stmmaceth clock pointer. It isn't correct from the platform clock bindings point of view. The "stmmaceth" clock is supposed to be the system clock, which is responsible for clocking the DMA transfers from/to the controller FIFOs to/from the system memory and the CSR interface if the later isn't separately clocked. If it's clocked separately then the STMMAC platform code expects to also have "pclk" specified. So in order to have the STMMAC platform data properly initialized we need to set the "master_bus" clock handler to the "stmmaceth" clock pointer, and the "slave_bus" clock handler to the "pclk" clock pointer. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)