diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-11-25 11:53:57 +0200 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-11-25 18:03:19 +0200 |
| commit | c0c489c0e865f898791fb491b46c12bc7f991b2c (patch) | |
| tree | 3fc2d5b516d6f1271fce216889d6d40a477b94be /drivers/pci/dwc | |
| parent | 4f1ee2ce947031778d28a3aa011561d9feaf31d8 (diff) | |
Revert "Revert "MLK-18433 PCI: imx: remove the lpcg_xxx clocks in driver""
This reverts commit c1e7d4fc8c1b9bd599eed9cf848eff3ed9a34637.
Adding pcie_per leads to eventual kernel panics on boot for Apalis
iMX8QM modules.
Related-To: #58016
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'drivers/pci/dwc')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 5ecae3b160be..7855ded3102f 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -78,7 +78,6 @@ struct imx_pcie { struct clk *pcie_bus; struct clk *pcie_phy; struct clk *pcie_inbound_axi; - struct clk *pcie_per; struct clk *pcie; struct clk *pcie_ext; struct clk *pcie_ext_src; @@ -641,17 +640,8 @@ static int imx_pcie_enable_ref_clk(struct imx_pcie *imx_pcie) case IMX8QXP: case IMX8QM: ret = clk_prepare_enable(imx_pcie->pcie_inbound_axi); - if (ret) { + if (ret) dev_err(dev, "unable to enable pcie_axi clock\n"); - break; - } - ret = clk_prepare_enable(imx_pcie->pcie_per); - if (ret) { - dev_err(dev, "unable to enable pcie_per clock\n"); - clk_disable_unprepare(imx_pcie->pcie_inbound_axi); - break; - } - break; } @@ -1509,7 +1499,6 @@ static void pci_imx_clk_disable(struct device *dev) break; case IMX8QXP: case IMX8QM: - clk_disable_unprepare(imx_pcie->pcie_per); clk_disable_unprepare(imx_pcie->pcie_inbound_axi); break; } @@ -2507,12 +2496,6 @@ static int imx_pcie_probe(struct platform_device *pdev) ("fsl,imx6sx-iomuxc-gpr"); } else if (imx_pcie->variant == IMX8QM || imx_pcie->variant == IMX8QXP) { - imx_pcie->pcie_per = devm_clk_get(dev, "pcie_per"); - if (IS_ERR(imx_pcie->pcie_per)) { - dev_err(dev, "pcie_per clock source missing or invalid\n"); - return PTR_ERR(imx_pcie->pcie_per); - } - imx_pcie->iomuxc_gpr = syscon_regmap_lookup_by_phandle(node, "hsio"); imx_pcie->pcie_inbound_axi = devm_clk_get(&pdev->dev, |