diff options
| author | Richard Zhu <hongxing.zhu@nxp.com> | 2018-06-14 14:41:34 +0800 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2018-06-15 19:00:38 +0200 |
| commit | 9b8da32493057502a912b6d1426eadeb76780e69 (patch) | |
| tree | 8d84ec03b1b8e44a1bafd29fb6b75bae6efff178 | |
| parent | 1ebcb9dd9645b5fca966515e7c02f197aa879b2b (diff) | |
MLK-18433 PCI: imx: remove the lpcg_xxx clocks in driver
Remove the lpcg_xxx clocks codes, since they are HW gated.
These clocks controlled by HW, and would be turned on
automatically, if there are access operations.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi | 6 | ||||
| -rw-r--r-- | drivers/pci/host/pci-imx6.c | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi index d13991fba9ce..10703a265020 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi @@ -3502,9 +3502,8 @@ clocks = <&clk IMX8QM_HSIO_PCIE_A_MSTR_AXI_CLK>, <&clk IMX8QM_HSIO_PCIE_A_SLV_AXI_CLK>, <&clk IMX8QM_HSIO_PHY_X2_PCLK_0>, - <&clk IMX8QM_HSIO_PCIE_X2_PER_CLK>, <&clk IMX8QM_HSIO_PCIE_A_DBI_AXI_CLK>; - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi"; + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi"; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &gic 0 73 4>, @@ -3543,9 +3542,8 @@ clocks = <&clk IMX8QM_HSIO_PCIE_B_MSTR_AXI_CLK>, <&clk IMX8QM_HSIO_PCIE_B_SLV_AXI_CLK>, <&clk IMX8QM_HSIO_PHY_X2_PCLK_1>, - <&clk IMX8QM_HSIO_PCIE_X1_PER_CLK>, <&clk IMX8QM_HSIO_PCIE_B_DBI_AXI_CLK>; - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi"; + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi"; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &gic 0 105 4>, diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index a92679e13eb0..0de405f68e36 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -73,7 +73,6 @@ struct imx6_pcie { struct clk *pcie_bus; struct clk *pcie_inbound_axi; struct clk *pcie_phy; - struct clk *pcie_per; struct clk *pcie; struct clk *pcie_ext; struct clk *pcie_ext_src; @@ -541,13 +540,6 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) dev_err(dev, "unable to enable pcie_axi clock\n"); break; } - ret = clk_prepare_enable(imx6_pcie->pcie_per); - if (ret) { - dev_err(dev, "unable to enable pcie_per clock\n"); - clk_disable_unprepare(imx6_pcie->pcie_inbound_axi); - break; - } - break; } @@ -1239,7 +1231,6 @@ static void pci_imx_clk_disable(struct device *dev) break; case IMX8QXP: case IMX8QM: - clk_disable_unprepare(imx6_pcie->pcie_per); clk_disable_unprepare(imx6_pcie->pcie_inbound_axi); break; } @@ -2123,12 +2114,6 @@ static int imx6_pcie_probe(struct platform_device *pdev) ("fsl,imx6sx-iomuxc-gpr"); } else if (imx6_pcie->variant == IMX8QM || imx6_pcie->variant == IMX8QXP) { - imx6_pcie->pcie_per = devm_clk_get(dev, "pcie_per"); - if (IS_ERR(imx6_pcie->pcie_per)) { - dev_err(dev, "pcie_per clock source missing or invalid\n"); - return PTR_ERR(imx6_pcie->pcie_per); - } - imx6_pcie->iomuxc_gpr = syscon_regmap_lookup_by_phandle(node, "hsio"); imx6_pcie->pcie_inbound_axi = devm_clk_get(&pdev->dev, |