* [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear
@ 2026-09-24 8:34 Peng Fan (OSS)
2026-09-24 8:50 ` Hongxing Zhu
2026-09-24 17:04 ` Frank Li
0 siblings, 2 replies; 3+ messages in thread
From: Peng Fan (OSS) @ 2026-09-24 8:34 UTC (permalink / raw)
To: Richard Zhu, Lucas Stach, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Frank Li, Sascha Hauer, Pengutronix Kernel Team,
Fabio Estevam
Cc: linux-kernel, Peng Fan, linux-pci, linux-arm-kernel, imx
From: Peng Fan <peng.fan@nxp.com>
Replace multiple if/else blocks using regmap_set_bits()/regmap_clear_bits()
with the simpler regmap_assign_bits() calls.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/pci/controller/dwc/pci-imx6.c | 32 +++++++--------------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 28fed010b503f..e2e55a88e0132 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -747,12 +747,8 @@ static int imx_pcie_attach_pd(struct device *dev)
static int imx6q_pcie_enable_ref_clk(struct imx_pcie *imx_pcie, bool enable)
{
- if (enable)
- regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_REF_CLK_EN);
- else
- regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_REF_CLK_EN);
+ regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
+ IMX6Q_GPR1_PCIE_REF_CLK_EN, enable);
return 0;
}
@@ -868,12 +864,8 @@ static void imx_pcie_clk_disable(struct imx_pcie *imx_pcie)
static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
{
- if (assert)
- regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
- IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
- else
- regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
- IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
+ regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
+ IMX6SX_GPR12_PCIE_TEST_POWERDOWN, assert);
/* Force PCIe PHY reset */
regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5, IMX6SX_GPR5_PCIE_BTNRST_RESET,
@@ -883,12 +875,8 @@ static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
{
- if (assert)
- regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_TEST_PD);
- else
- regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_TEST_PD);
+ regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
+ IMX6Q_GPR1_PCIE_TEST_PD, assert);
regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_SW_RST,
assert ? IMX6Q_GPR1_PCIE_SW_RST : 0);
@@ -901,12 +889,8 @@ static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
static int imx6q_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
{
- if (assert)
- regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_TEST_PD);
- else
- regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
- IMX6Q_GPR1_PCIE_TEST_PD);
+ regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
+ IMX6Q_GPR1_PCIE_TEST_PD, assert);
if (!assert)
usleep_range(200, 500);
--
2.50.1
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear
2026-09-24 8:34 [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear Peng Fan (OSS)
@ 2026-09-24 8:50 ` Hongxing Zhu
2026-09-24 17:04 ` Frank Li
1 sibling, 0 replies; 3+ messages in thread
From: Hongxing Zhu @ 2026-09-24 8:50 UTC (permalink / raw)
To: Peng Fan (OSS),
Lucas Stach, Lorenzo Pieralisi, Krzysztof Wilczyński,
Manivannan Sadhasivam, Rob Herring, Bjorn Helgaas, Frank Li,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: linux-kernel, Peng Fan, linux-pci, linux-arm-kernel, imx
> -----Original Message-----
> From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
> Sent: Thursday, September 24, 2026 4:34 PM
> To: Hongxing Zhu <hongxing.zhu@nxp.com>; Lucas Stach
> <l.stach@pengutronix.de>; Lorenzo Pieralisi <lpieralisi@kernel.org>; Krzysztof
> Wilczyński <kwilczynski@kernel.org>; Manivannan Sadhasivam
> <mani@kernel.org>; Rob Herring <robh@kernel.org>; Bjorn Helgaas
> <bhelgaas@google.com>; Frank Li <frank.li@nxp.com>; Sascha Hauer
> <s.hauer@pengutronix.de>; Pengutronix Kernel Team
> <kernel@pengutronix.de>; Fabio Estevam <festevam@gmail.com>
> Cc: linux-kernel@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; linux-
> pci@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> imx@lists.linux.dev
> Subject: [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional
> set/clear
>
> From: Peng Fan <peng.fan@nxp.com>
>
> Replace multiple if/else blocks using regmap_set_bits()/regmap_clear_bits()
> with the simpler regmap_assign_bits() calls.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Thanks.
Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
Best Regards
Richard Zhu
> ---
> drivers/pci/controller/dwc/pci-imx6.c | 32 +++++++--------------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c
> b/drivers/pci/controller/dwc/pci-imx6.c
> index 28fed010b503f..e2e55a88e0132 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -747,12 +747,8 @@ static int imx_pcie_attach_pd(struct device *dev)
>
> static int imx6q_pcie_enable_ref_clk(struct imx_pcie *imx_pcie, bool enable)
> {
> - if (enable)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_REF_CLK_EN);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_REF_CLK_EN);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_REF_CLK_EN, enable);
>
> return 0;
> }
> @@ -868,12 +864,8 @@ static void imx_pcie_clk_disable(struct imx_pcie
> *imx_pcie)
>
> static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> + IMX6SX_GPR12_PCIE_TEST_POWERDOWN, assert);
>
> /* Force PCIe PHY reset */
> regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5,
> IMX6SX_GPR5_PCIE_BTNRST_RESET, @@ -883,12 +875,8 @@ static int
> imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
>
> static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_TEST_PD, assert);
>
> regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> IMX6Q_GPR1_PCIE_SW_RST,
> assert ? IMX6Q_GPR1_PCIE_SW_RST : 0); @@ -
> 901,12 +889,8 @@ static int imx6qp_pcie_core_reset(struct imx_pcie
> *imx_pcie, bool assert)
>
> static int imx6q_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_TEST_PD, assert);
>
> if (!assert)
> usleep_range(200, 500);
> --
> 2.50.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear
2026-09-24 8:34 [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear Peng Fan (OSS)
2026-09-24 8:50 ` Hongxing Zhu
@ 2026-09-24 17:04 ` Frank Li
1 sibling, 0 replies; 3+ messages in thread
From: Frank Li @ 2026-09-24 17:04 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: Richard Zhu, Lucas Stach, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Frank Li, Sascha Hauer, Pengutronix Kernel Team,
Fabio Estevam, linux-kernel, Peng Fan, linux-pci,
linux-arm-kernel, imx
On Thu, Sep 24, 2026 at 04:34:28PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Replace multiple if/else blocks using regmap_set_bits()/regmap_clear_bits()
> with the simpler regmap_assign_bits() calls.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
Thanks for clean up this. It is much better.
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> drivers/pci/controller/dwc/pci-imx6.c | 32 +++++++--------------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index 28fed010b503f..e2e55a88e0132 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -747,12 +747,8 @@ static int imx_pcie_attach_pd(struct device *dev)
>
> static int imx6q_pcie_enable_ref_clk(struct imx_pcie *imx_pcie, bool enable)
> {
> - if (enable)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_REF_CLK_EN);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_REF_CLK_EN);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_REF_CLK_EN, enable);
>
> return 0;
> }
> @@ -868,12 +864,8 @@ static void imx_pcie_clk_disable(struct imx_pcie *imx_pcie)
>
> static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
> {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
> + IMX6SX_GPR12_PCIE_TEST_POWERDOWN, assert);
>
> /* Force PCIe PHY reset */
> regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5, IMX6SX_GPR5_PCIE_BTNRST_RESET,
> @@ -883,12 +875,8 @@ static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
>
> static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
> {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_TEST_PD, assert);
>
> regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_SW_RST,
> assert ? IMX6Q_GPR1_PCIE_SW_RST : 0);
> @@ -901,12 +889,8 @@ static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
>
> static int imx6q_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
> {
> - if (assert)
> - regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> - else
> - regmap_clear_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD);
> + regmap_assign_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_TEST_PD, assert);
>
> if (!assert)
> usleep_range(200, 500);
> --
> 2.50.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-09-24 17:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-24 8:34 [PATCH] PCI: dwc: imx6: use regmap_assign_bits() for conditional set/clear Peng Fan (OSS)
2026-09-24 8:50 ` Hongxing Zhu
2026-09-24 17:04 ` Frank Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®