All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Richard Zhu <hongxing.zhu@nxp.com>,
	Lucas Stach <l.stach@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Fabio Estevam <festevam@gmail.com>,
	Francesco Dolcini <francesco.dolcini@toradex.com>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@pengutronix.de,
	linux-imx@nxp.com, Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH v12 04/13] PCI: imx6: Move imx6_pcie_clk_disable() earlier
Date: Wed, 15 Jun 2022 18:15:42 -0500	[thread overview]
Message-ID: <20220615231551.1054753-5-helgaas@kernel.org> (raw)
In-Reply-To: <20220615231551.1054753-1-helgaas@kernel.org>

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


WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org>
To: Richard Zhu <hongxing.zhu@nxp.com>,
	Lucas Stach <l.stach@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Fabio Estevam <festevam@gmail.com>,
	Francesco Dolcini <francesco.dolcini@toradex.com>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@pengutronix.de,
	linux-imx@nxp.com, Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH v12 04/13] PCI: imx6: Move imx6_pcie_clk_disable() earlier
Date: Wed, 15 Jun 2022 18:15:42 -0500	[thread overview]
Message-ID: <20220615231551.1054753-5-helgaas@kernel.org> (raw)
In-Reply-To: <20220615231551.1054753-1-helgaas@kernel.org>

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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-06-15 23:16 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-15 23:15 [PATCH v12 00/13] PCI: imx6: refine codes and add the error propagation Bjorn Helgaas
2022-06-15 23:15 ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 01/13] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-16  2:23   ` Hongxing Zhu
2022-06-16  2:23     ` Hongxing Zhu
2022-06-15 23:15 ` [PATCH v12 02/13] PCI: imx6: Move PHY management functions together Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-16  2:23   ` Hongxing Zhu
2022-06-16  2:23     ` Hongxing Zhu
2022-06-15 23:15 ` [PATCH v12 03/13] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-16  2:23   ` Hongxing Zhu
2022-06-16  2:23     ` Hongxing Zhu
2022-06-15 23:15 ` Bjorn Helgaas [this message]
2022-06-15 23:15   ` [PATCH v12 04/13] PCI: imx6: Move imx6_pcie_clk_disable() earlier Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 05/13] PCI: imx6: Factor out ref clock disable to match enable Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-16  2:23   ` Hongxing Zhu
2022-06-16  2:23     ` Hongxing Zhu
2022-06-15 23:15 ` [PATCH v12 06/13] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 07/13] PCI: imx6: Propagate .host_init() errors to caller Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 08/13] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 09/13] PCI: imx6: Turn off regulator when system is in suspend mode Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:30   ` Bjorn Helgaas
2022-06-15 23:30     ` Bjorn Helgaas
2022-06-16  2:23     ` Hongxing Zhu
2022-06-16  2:23       ` Hongxing Zhu
2022-06-16 15:56       ` Bjorn Helgaas
2022-06-16 15:56         ` Bjorn Helgaas
2022-06-17  5:57         ` Hongxing Zhu
2022-06-17  5:57           ` Hongxing Zhu
2022-06-15 23:15 ` [PATCH v12 10/13] PCI: imx6: Mark the link down as non-fatal error Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 11/13] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 12/13] PCI: imx6: Do not hide phy driver callbacks and refine the error handling Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:15 ` [PATCH v12 13/13] PCI: imx6: Disable clocks in reverse order of enable Bjorn Helgaas
2022-06-15 23:15   ` Bjorn Helgaas
2022-06-15 23:27   ` Bjorn Helgaas
2022-06-15 23:27     ` Bjorn Helgaas
2022-06-16  2:23   ` Hongxing Zhu
2022-06-16  2:23     ` Hongxing 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=20220615231551.1054753-5-helgaas@kernel.org \
    --to=helgaas@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=broonie@kernel.org \
    --cc=festevam@gmail.com \
    --cc=francesco.dolcini@toradex.com \
    --cc=hongxing.zhu@nxp.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.