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: Timur Tabi <ti...@codeaurora.org>
---
drivers/net/ethernet/qualcomm/emac/emac.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c
b/drivers/net/ethernet/qualcomm/emac/emac.c
index ae32f85..b1c1cdc 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -627,11 +627,12 @@ static int emac_probe(struct platform_device *pdev)
if (ret)
goto err_undo_netdev;
- /* initialize clocks */
- ret = emac_clks_phase1_init(pdev, adpt);
- if (ret) {
- dev_err(&pdev->dev, "could not initialize clocks\n");
- goto err_undo_netdev;
+ if (!has_acpi_companion(&pdev->dev)) {
+ ret = emac_clks_phase1_init(pdev, adpt);
+ if (ret) {
+ dev_err(&pdev->dev, "could not initialize clocks\n");
+ goto err_undo_netdev;
+ }
}
netdev->watchdog_timeo = EMAC_WATCHDOG_TIME;
@@ -655,11 +656,12 @@ static int emac_probe(struct platform_device *pdev)
if (ret)
goto err_undo_mdiobus;
- /* enable clocks */
- ret = emac_clks_phase2_init(pdev, adpt);
- if (ret) {
- dev_err(&pdev->dev, "could not initialize clocks\n");
- goto err_undo_mdiobus;
+ if (!has_acpi_companion(&pdev->dev)) {
+ ret = emac_clks_phase2_init(pdev, adpt);
+ if (ret) {
+ dev_err(&pdev->dev, "could not initialize clocks\n");
+ goto err_undo_mdiobus;
+ }
}
emac_mac_reset(adpt);
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
