lkml.org 
[lkml]   [2022]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v12 04/13] PCI: imx6: Move imx6_pcie_clk_disable() earlier
    Date
    From: Richard Zhu <hongxing.zhu@nxp.com>

    Move imx6_pcie_clk_disable() earlier to be near other clock-related
    functions. No functional change intended.

    [bhelgaas: reorder patch so pure moves are earlier]
    Link: https://lore.kernel.org/r/1655189942-12678-4-git-send-email-hongxing.z
    hu@nxp.com
    Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
    ---
    drivers/pci/controller/dwc/pci-imx6.c | 48 +++++++++++++--------------
    1 file changed, 24 insertions(+), 24 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
    index a6d2b907d42b..38f208eea2d7 100644
    --- a/drivers/pci/controller/dwc/pci-imx6.c
    +++ b/drivers/pci/controller/dwc/pci-imx6.c
    @@ -580,6 +580,30 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
    return ret;
    }

    +static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie)
    +{
    + clk_disable_unprepare(imx6_pcie->pcie);
    + clk_disable_unprepare(imx6_pcie->pcie_phy);
    + clk_disable_unprepare(imx6_pcie->pcie_bus);
    +
    + switch (imx6_pcie->drvdata->variant) {
    + case IMX6SX:
    + clk_disable_unprepare(imx6_pcie->pcie_inbound_axi);
    + break;
    + case IMX7D:
    + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
    + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL,
    + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL);
    + break;
    + case IMX8MQ:
    + case IMX8MM:
    + clk_disable_unprepare(imx6_pcie->pcie_aux);
    + break;
    + default:
    + break;
    + }
    +}
    +
    static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
    {
    struct device *dev = imx6_pcie->pci->dev;
    @@ -941,30 +965,6 @@ static void imx6_pcie_pm_turnoff(struct imx6_pcie *imx6_pcie)
    usleep_range(1000, 10000);
    }

    -static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie)
    -{
    - clk_disable_unprepare(imx6_pcie->pcie);
    - clk_disable_unprepare(imx6_pcie->pcie_phy);
    - clk_disable_unprepare(imx6_pcie->pcie_bus);
    -
    - switch (imx6_pcie->drvdata->variant) {
    - case IMX6SX:
    - clk_disable_unprepare(imx6_pcie->pcie_inbound_axi);
    - break;
    - case IMX7D:
    - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
    - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL,
    - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL);
    - break;
    - case IMX8MQ:
    - case IMX8MM:
    - clk_disable_unprepare(imx6_pcie->pcie_aux);
    - break;
    - default:
    - break;
    - }
    -}
    -
    static int imx6_pcie_suspend_noirq(struct device *dev)
    {
    struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-06-16 01:18    [W:5.122 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site