From: Christian Bruel <christian.bruel@foss.st.com>
To: <christian.bruel@foss.st.com>, <lpieralisi@kernel.org>,
<kwilczynski@kernel.org>, <mani@kernel.org>, <robh@kernel.org>,
<bhelgaas@google.com>, <mcoquelin.stm32@gmail.com>,
<alexandre.torgue@foss.st.com>, <linus.walleij@linaro.org>
Cc: <linux-pci@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-gpio@vger.kernel.org>,
kernel test robot <lkp@intel.com>
Subject: [RESEND PATCH 2/2] PCI: stm32: use pinctrl_pm_select_init_state() in stm32_pcie_resume_noirq()
Date: Thu, 17 Jul 2025 08:30:42 +0200 [thread overview]
Message-ID: <20250717063042.2236524-3-christian.bruel@foss.st.com> (raw)
In-Reply-To: <20250717063042.2236524-1-christian.bruel@foss.st.com>
Replace direct access to dev->pins->init_state with the new helper
pinctrl_pm_select_init_state() to select the init pinctrl state.
This fixes build issues when CONFIG_PINCTRL is not defined.
Signed-off-by: Christian Bruel <christian.bruel@foss.st.com>
Reported-by: Bjorn Helgaas <bhelgaas@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202506260920.bmQ9hQ9s-lkp@intel.com/
Fixes: 633f42f48af5 ("PCI: stm32: Add PCIe host support for STM32MP25")
---
drivers/pci/controller/dwc/pcie-stm32.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-stm32.c b/drivers/pci/controller/dwc/pcie-stm32.c
index 50fae5f5ced2..c1d803dc3778 100644
--- a/drivers/pci/controller/dwc/pcie-stm32.c
+++ b/drivers/pci/controller/dwc/pcie-stm32.c
@@ -28,6 +28,7 @@ struct stm32_pcie {
struct clk *clk;
struct gpio_desc *perst_gpio;
struct gpio_desc *wake_gpio;
+ bool have_pinctrl_init;
};
static void stm32_pcie_deassert_perst(struct stm32_pcie *stm32_pcie)
@@ -91,10 +92,10 @@ static int stm32_pcie_resume_noirq(struct device *dev)
/*
* The core clock is gated with CLKREQ# from the COMBOPHY REFCLK,
* thus if no device is present, must force it low with an init pinmux
- * to be able to access the DBI registers.
+ * if present to be able to access the DBI registers.
*/
- if (!IS_ERR(dev->pins->init_state))
- ret = pinctrl_select_state(dev->pins->p, dev->pins->init_state);
+ if (stm32_pcie->have_pinctrl_init)
+ ret = pinctrl_pm_select_init_state(dev);
else
ret = pinctrl_pm_select_default_state(dev);
@@ -274,6 +275,9 @@ static int stm32_pcie_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(stm32_pcie->rst),
"Failed to get PCIe reset\n");
+ if (device_property_match_string(dev, "pinctrl-names", PINCTRL_STATE_INIT) >= 0)
+ stm32_pcie->have_pinctrl_init = true;
+
ret = stm32_pcie_parse_port(stm32_pcie);
if (ret)
return ret;
--
2.34.1
next prev parent reply other threads:[~2025-07-17 6:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-17 6:30 [RESEND PATCH 0/2] Add pinctrl_pm_select_init_state helper function Christian Bruel
2025-07-17 6:30 ` [RESEND PATCH 1/2] pinctrl: " Christian Bruel
2025-07-17 6:30 ` Christian Bruel [this message]
2025-08-07 18:05 ` [RESEND PATCH 2/2] PCI: stm32: use pinctrl_pm_select_init_state() in stm32_pcie_resume_noirq() Bjorn Helgaas
2025-07-23 11:32 ` [RESEND PATCH 0/2] Add pinctrl_pm_select_init_state helper function Linus Walleij
2025-07-23 21:07 ` Bjorn Helgaas
2025-07-24 13:36 ` Christian Bruel
2025-08-07 14:15 ` Christian Bruel
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=20250717063042.2236524-3-christian.bruel@foss.st.com \
--to=christian.bruel@foss.st.com \
--cc=alexandre.torgue@foss.st.com \
--cc=bhelgaas@google.com \
--cc=kwilczynski@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=lkp@intel.com \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh@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).