shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

PCI: rockchip: dw: Remove rk_pcie_clk_init()

Browse Source 
Move devm_clk_bulk_get_all into rk_pcie_resource_get()

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I4115faaa1fd84f7c7b521a025c3b9682e920c362
This commit is contained in:
Shawn Lin
2024-08-02 15:35:09 +08:00
committed by Tao Huang
parent 818669da27
commit b58cb3ff2b
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pci/controller/dwc/pcie-dw-rockchip.c
View File

@@ -462,24 +462,6 @@ static int rk_add_pcie_port(struct rk_pcie *rk_pcie, struct platform_device *pde
return 0;
}
static int rk_pcie_clk_init(struct rk_pcie *rk_pcie)
{
struct device *dev = rk_pcie->pci->dev;
int ret;
rk_pcie->clk_cnt = devm_clk_bulk_get_all(dev, &rk_pcie->clks);
if (rk_pcie->clk_cnt < 1)
return -ENODEV;
ret = clk_bulk_prepare_enable(rk_pcie->clk_cnt, rk_pcie->clks);
if (ret) {
dev_err(dev, "failed to prepare enable pcie bulk clks: %d\n", ret);
return ret;
}
return 0;
}
static int rk_pcie_resource_get(struct platform_device *pdev,
struct rk_pcie *rk_pcie)
{
@@ -533,6 +515,10 @@ static int rk_pcie_resource_get(struct platform_device *pdev,
if (IS_ERR_OR_NULL(rk_pcie->prsnt_gpio))
dev_info(&pdev->dev, "invalid prsnt-gpios property in node\n");
rk_pcie->clk_cnt = devm_clk_bulk_get_all(&pdev->dev, &rk_pcie->clks);
if (rk_pcie->clk_cnt < 1)
return -ENODEV;
return 0;
}
@@ -1217,7 +1203,7 @@ retry_regulator:
reset_control_deassert(rk_pcie->rsts);
ret = rk_pcie_clk_init(rk_pcie);
ret = clk_bulk_prepare_enable(rk_pcie->clk_cnt, rk_pcie->clks);
if (ret) {
dev_err(dev, "clock init failed\n");
goto disable_phy;