Commit 026acd5f authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller

net: qcom/emac: don't try to claim clocks on ACPI systems

On ACPI systems, clocks are not available to drivers directly.  They are
handled exclusively by ACPI and/or firmware, so there is no clock driver.
Calls to clk_get() always fail, so we should not even attempt to claim
any clocks on ACPI systems.
Signed-off-by: default avatarTimur Tabi <timur@codeaurora.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b822ee6c
...@@ -460,6 +460,12 @@ static int emac_clks_phase1_init(struct platform_device *pdev, ...@@ -460,6 +460,12 @@ static int emac_clks_phase1_init(struct platform_device *pdev,
{ {
int ret; int ret;
/* On ACPI platforms, clocks are controlled by firmware and/or
* ACPI, not by drivers.
*/
if (has_acpi_companion(&pdev->dev))
return 0;
ret = emac_clks_get(pdev, adpt); ret = emac_clks_get(pdev, adpt);
if (ret) if (ret)
return ret; return ret;
...@@ -485,6 +491,9 @@ static int emac_clks_phase2_init(struct platform_device *pdev, ...@@ -485,6 +491,9 @@ static int emac_clks_phase2_init(struct platform_device *pdev,
{ {
int ret; int ret;
if (has_acpi_companion(&pdev->dev))
return 0;
ret = clk_set_rate(adpt->clk[EMAC_CLK_TX], 125000000); ret = clk_set_rate(adpt->clk[EMAC_CLK_TX], 125000000);
if (ret) if (ret)
return ret; return ret;
......
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