From: Richard Zhu <hongxing.zhu@nxp.com>
To: l.stach@pengutronix.de, bhelgaas@google.com, robh+dt@kernel.org,
broonie@kernel.org, lorenzo.pieralisi@arm.com,
festevam@gmail.com, francesco.dolcini@toradex.com
Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@pengutronix.de,
linux-imx@nxp.com
Subject: [PATCH v13 04/15] PCI: imx6: Move imx6_pcie_clk_disable() earlier
Date: Fri, 17 Jun 2022 18:31:03 +0800 [thread overview]
Message-ID: <1655461874-16908-5-git-send-email-hongxing.zhu@nxp.com> (raw)
In-Reply-To: <1655461874-16908-1-git-send-email-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
next prev parent reply other threads:[~2022-06-17 10:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-17 10:30 [PATCH v13 0/15] PCI: imx6: refine codes and add the error propagation Richard Zhu
2022-06-17 10:31 ` [PATCH v13 01/15] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Richard Zhu
2022-06-17 10:31 ` [PATCH v13 02/15] PCI: imx6: Move PHY management functions together Richard Zhu
2022-06-17 10:31 ` [PATCH v13 03/15] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Richard Zhu
2022-06-17 10:31 ` Richard Zhu [this message]
2022-06-17 10:31 ` [PATCH v13 05/15] PCI: imx6: Factor out ref clock disable to match enable Richard Zhu
2022-06-17 10:31 ` [PATCH v13 06/15] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Richard Zhu
2022-06-17 10:31 ` [PATCH v13 07/15] PCI: imx6: Propagate .host_init() errors to caller Richard Zhu
2022-06-17 10:31 ` [PATCH v13 08/15] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Richard Zhu
2022-06-17 10:31 ` [PATCH v13 09/15] PCI: imx6: Call host init function directly in resume Richard Zhu
2022-06-17 10:31 ` [PATCH v13 10/15] PCI: imx6: Turn off regulator when system is in suspend mode Richard Zhu
2022-06-23 22:19 ` Bjorn Helgaas
2022-06-24 5:05 ` Hongxing Zhu
2022-06-27 19:51 ` Bjorn Helgaas
2022-06-28 3:48 ` Hongxing Zhu
2022-06-28 15:51 ` Bjorn Helgaas
2022-06-29 3:56 ` Hongxing Zhu
2022-06-17 10:31 ` [PATCH v13 11/15] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset() Richard Zhu
2022-06-17 10:31 ` [PATCH v13 12/15] PCI: imx6: Mark the link down as non-fatal error Richard Zhu
2022-06-17 10:31 ` [PATCH v13 13/15] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Richard Zhu
2022-06-17 10:31 ` [PATCH v13 14/15] PCI: imx6: Do not hide phy driver callbacks and refine the error handling Richard Zhu
2022-06-17 10:31 ` [PATCH v13 15/15] PCI: imx6: Disable clocks in reverse order of enable Richard Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655461874-16908-5-git-send-email-hongxing.zhu@nxp.com \
--to=hongxing.zhu@nxp.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=francesco.dolcini@toradex.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).