qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dwc_eth_qos: Make clk_rx and clk_tx optional 

For others using, clk_rx and clk_tx may not be necessary,
and their clock names are different.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I952ac6cc6a4278c887b530bd6d387752358c89a8
This commit is contained in:
David Wu 2020-04-30 10:14:02 +08:00 committed by Joseph Chen
parent bbbbc81c01
commit b29cefabfd
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/dwc_eth_qos.c
View File

@ -612,17 +612,21 @@ static int eqos_start_clks_stm32(struct udevice *dev)
goto err; goto err;
} }
if (clk_valid(&eqos->clk_rx)) {
ret = clk_enable(&eqos->clk_rx); ret = clk_enable(&eqos->clk_rx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_rx) failed: %d", ret); pr_err("clk_enable(clk_rx) failed: %d", ret);
goto err_disable_clk_master_bus; goto err_disable_clk_master_bus;
} }
}
if (clk_valid(&eqos->clk_tx)) {
ret = clk_enable(&eqos->clk_tx); ret = clk_enable(&eqos->clk_tx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_tx) failed: %d", ret); pr_err("clk_enable(clk_tx) failed: %d", ret);
goto err_disable_clk_rx; goto err_disable_clk_rx;
} }
}
if (clk_valid(&eqos->clk_ck)) { if (clk_valid(&eqos->clk_ck)) {
ret = clk_enable(&eqos->clk_ck); ret = clk_enable(&eqos->clk_ck);
@ -638,8 +642,10 @@ static int eqos_start_clks_stm32(struct udevice *dev)
#ifdef CONFIG_CLK #ifdef CONFIG_CLK
err_disable_clk_tx: err_disable_clk_tx:
if (clk_valid(&eqos->clk_tx))
clk_disable(&eqos->clk_tx); clk_disable(&eqos->clk_tx);
err_disable_clk_rx: err_disable_clk_rx:
if (clk_valid(&eqos->clk_rx))
clk_disable(&eqos->clk_rx); clk_disable(&eqos->clk_rx);
err_disable_clk_master_bus: err_disable_clk_master_bus:
clk_disable(&eqos->clk_master_bus); clk_disable(&eqos->clk_master_bus);
@ -678,7 +684,9 @@ static void eqos_stop_clks_stm32(struct udevice *dev)
debug("%s(dev=%p):\n", __func__, dev); debug("%s(dev=%p):\n", __func__, dev);
if (clk_valid(&eqos->clk_tx))
clk_disable(&eqos->clk_tx); clk_disable(&eqos->clk_tx);
if (clk_valid(&eqos->clk_rx))
clk_disable(&eqos->clk_rx); clk_disable(&eqos->clk_rx);
clk_disable(&eqos->clk_master_bus); clk_disable(&eqos->clk_master_bus);
if (clk_valid(&eqos->clk_ck)) if (clk_valid(&eqos->clk_ck))
@ -1842,20 +1850,16 @@ static int eqos_probe_resources_stm32(struct udevice *dev)
ret = clk_get_by_name(dev, "stmmaceth", &eqos->clk_master_bus); ret = clk_get_by_name(dev, "stmmaceth", &eqos->clk_master_bus);
if (ret) { if (ret) {
pr_err("clk_get_by_name(master_bus) failed: %d", ret); pr_err("clk_get_by_name(master_bus) failed: %d", ret);
goto err_probe; return ret;
} }
ret = clk_get_by_name(dev, "mac-clk-rx", &eqos->clk_rx); ret = clk_get_by_name(dev, "mac-clk-rx", &eqos->clk_rx);
if (ret) { if (ret)
pr_err("clk_get_by_name(rx) failed: %d", ret); pr_warn("clk_get_by_name(rx) failed: %d", ret);
goto err_free_clk_master_bus;
}
ret = clk_get_by_name(dev, "mac-clk-tx", &eqos->clk_tx); ret = clk_get_by_name(dev, "mac-clk-tx", &eqos->clk_tx);
if (ret) { if (ret)
pr_err("clk_get_by_name(tx) failed: %d", ret); pr_warn("clk_get_by_name(tx) failed: %d", ret);
goto err_free_clk_rx;
}
/* Get ETH_CLK clocks (optional) */ /* Get ETH_CLK clocks (optional) */
ret = clk_get_by_name(dev, "eth-ck", &eqos->clk_ck); ret = clk_get_by_name(dev, "eth-ck", &eqos->clk_ck);
@ -1900,15 +1904,6 @@ static int eqos_probe_resources_stm32(struct udevice *dev)
debug("%s: OK\n", __func__); debug("%s: OK\n", __func__);
return 0; return 0;
err_free_clk_rx:
clk_free(&eqos->clk_rx);
err_free_clk_master_bus:
clk_free(&eqos->clk_master_bus);
err_probe:
debug("%s: returns %d\n", __func__, ret);
return ret;
} }
static phy_interface_t eqos_get_interface_stm32(struct udevice *dev) static phy_interface_t eqos_get_interface_stm32(struct udevice *dev)
@ -1990,7 +1985,9 @@ static int eqos_remove_resources_stm32(struct udevice *dev)
debug("%s(dev=%p):\n", __func__, dev); debug("%s(dev=%p):\n", __func__, dev);
if (clk_valid(&eqos->clk_tx))
clk_free(&eqos->clk_tx); clk_free(&eqos->clk_tx);
if (clk_valid(&eqos->clk_rx))
clk_free(&eqos->clk_rx); clk_free(&eqos->clk_rx);
clk_free(&eqos->clk_master_bus); clk_free(&eqos->clk_master_bus);
if (clk_valid(&eqos->clk_ck)) if (clk_valid(&eqos->clk_ck))