Commit ddfbee9e authored by Thierry Reding's avatar Thierry Reding Committed by David S. Miller

net: stmmac: Do not request stmmaceth clock

The stmmaceth clock is specified by the slave_bus and apb_pclk clocks in
the device tree bindings for snps,dwc-qos-ethernet-4.10 compatible nodes
of this IP.

The subdrivers for these bindings will be requesting the stmmac clock
correctly at a later point, so there is no need to request it here and
cause an error message to be printed to the kernel log.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a981c05
...@@ -521,13 +521,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) ...@@ -521,13 +521,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
} }
/* clock setup */ /* clock setup */
plat->stmmac_clk = devm_clk_get(&pdev->dev, if (!of_device_is_compatible(np, "snps,dwc-qos-ethernet-4.10")) {
STMMAC_RESOURCE_NAME); plat->stmmac_clk = devm_clk_get(&pdev->dev,
if (IS_ERR(plat->stmmac_clk)) { STMMAC_RESOURCE_NAME);
dev_warn(&pdev->dev, "Cannot get CSR clock\n"); if (IS_ERR(plat->stmmac_clk)) {
plat->stmmac_clk = NULL; dev_warn(&pdev->dev, "Cannot get CSR clock\n");
plat->stmmac_clk = NULL;
}
clk_prepare_enable(plat->stmmac_clk);
} }
clk_prepare_enable(plat->stmmac_clk);
plat->pclk = devm_clk_get(&pdev->dev, "pclk"); plat->pclk = devm_clk_get(&pdev->dev, "pclk");
if (IS_ERR(plat->pclk)) { if (IS_ERR(plat->pclk)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment