|
@@ -28,6 +28,7 @@
|
|
|
struct armada8k_pcie {
|
|
|
struct dw_pcie *pci;
|
|
|
struct clk *clk;
|
|
|
+ struct clk *clk_reg;
|
|
|
};
|
|
|
|
|
|
#define PCIE_VENDOR_REGS_OFFSET 0x8000
|
|
@@ -229,23 +230,36 @@ static int armada8k_pcie_probe(struct platform_device *pdev)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
+ pcie->clk_reg = devm_clk_get(dev, "reg");
|
|
|
+ if (pcie->clk_reg == ERR_PTR(-EPROBE_DEFER)) {
|
|
|
+ ret = -EPROBE_DEFER;
|
|
|
+ goto fail;
|
|
|
+ }
|
|
|
+ if (!IS_ERR(pcie->clk_reg)) {
|
|
|
+ ret = clk_prepare_enable(pcie->clk_reg);
|
|
|
+ if (ret)
|
|
|
+ goto fail_clkreg;
|
|
|
+ }
|
|
|
+
|
|
|
/* Get the dw-pcie unit configuration/control registers base. */
|
|
|
base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
|
|
|
pci->dbi_base = devm_pci_remap_cfg_resource(dev, base);
|
|
|
if (IS_ERR(pci->dbi_base)) {
|
|
|
dev_err(dev, "couldn't remap regs base %p\n", base);
|
|
|
ret = PTR_ERR(pci->dbi_base);
|
|
|
- goto fail;
|
|
|
+ goto fail_clkreg;
|
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, pcie);
|
|
|
|
|
|
ret = armada8k_add_pcie_port(pcie, pdev);
|
|
|
if (ret)
|
|
|
- goto fail;
|
|
|
+ goto fail_clkreg;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
+fail_clkreg:
|
|
|
+ clk_disable_unprepare(pcie->clk_reg);
|
|
|
fail:
|
|
|
clk_disable_unprepare(pcie->clk);
|
|
|
|