lkml.org 
[lkml]   [2022]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRE: [PATCH v12 01/13] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier
    Date

    > -----Original Message-----
    > From: Bjorn Helgaas <helgaas@kernel.org>
    > Sent: 2022年6月16日 7:16
    > To: Hongxing 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; dl-linux-imx
    > <linux-imx@nxp.com>; Bjorn Helgaas <bhelgaas@google.com>
    > Subject: [PATCH v12 01/13] PCI: imx6: Move imx6_pcie_grp_offset(),
    > imx6_pcie_configure_type() earlier
    >
    > From: Bjorn Helgaas <bhelgaas@google.com>
    >
    > Move imx6_pcie_grp_offset() and imx6_pcie_configure_type() earlier in the file
    > since they depend on nothing and are used by several other functions that will
    > be moved earlier. No functional change intended.
    >
    > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

    Best Regards
    Richard Zhu

    > ---
    > drivers/pci/controller/dwc/pci-imx6.c | 50 +++++++++++++--------------
    > 1 file changed, 25 insertions(+), 25 deletions(-)
    >
    > diff --git a/drivers/pci/controller/dwc/pci-imx6.c
    > b/drivers/pci/controller/dwc/pci-imx6.c
    > index 7a285fb0f619..8653ca8cbfb9 100644
    > --- a/drivers/pci/controller/dwc/pci-imx6.c
    > +++ b/drivers/pci/controller/dwc/pci-imx6.c
    > @@ -146,6 +146,31 @@ struct imx6_pcie {
    > #define PHY_RX_OVRD_IN_LO_RX_DATA_EN BIT(5)
    > #define PHY_RX_OVRD_IN_LO_RX_PLL_EN BIT(3)
    >
    > +static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie
    > +*imx6_pcie) {
    > + WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ &&
    > + imx6_pcie->drvdata->variant != IMX8MM);
    > + return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 :
    > IOMUXC_GPR14; }
    > +
    > +static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) {
    > + unsigned int mask, val;
    > +
    > + if (imx6_pcie->drvdata->variant == IMX8MQ &&
    > + imx6_pcie->controller_id == 1) {
    > + mask = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE;
    > + val = FIELD_PREP(IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
    > + PCI_EXP_TYPE_ROOT_PORT);
    > + } else {
    > + mask = IMX6Q_GPR12_DEVICE_TYPE;
    > + val = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE,
    > + PCI_EXP_TYPE_ROOT_PORT);
    > + }
    > +
    > + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, mask,
    > val); }
    > +
    > static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, bool exp_val) {
    > struct dw_pcie *pci = imx6_pcie->pci;
    > @@ -415,13 +440,6 @@ static void imx6_pcie_assert_core_reset(struct
    > imx6_pcie *imx6_pcie)
    > imx6_pcie->gpio_active_high);
    > }
    >
    > -static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
    > -{
    > - WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ &&
    > - imx6_pcie->drvdata->variant != IMX8MM);
    > - return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14;
    > -}
    > -
    > static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) {
    > struct dw_pcie *pci = imx6_pcie->pci;
    > @@ -617,24 +635,6 @@ static void imx6_pcie_deassert_core_reset(struct
    > imx6_pcie *imx6_pcie)
    > }
    > }
    >
    > -static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) -{
    > - unsigned int mask, val;
    > -
    > - if (imx6_pcie->drvdata->variant == IMX8MQ &&
    > - imx6_pcie->controller_id == 1) {
    > - mask = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE;
    > - val = FIELD_PREP(IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
    > - PCI_EXP_TYPE_ROOT_PORT);
    > - } else {
    > - mask = IMX6Q_GPR12_DEVICE_TYPE;
    > - val = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE,
    > - PCI_EXP_TYPE_ROOT_PORT);
    > - }
    > -
    > - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, mask,
    > val);
    > -}
    > -
    > static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) {
    > switch (imx6_pcie->drvdata->variant) {
    > --
    > 2.25.1

    \
     
     \ /
      Last update: 2022-06-16 04:24    [W:4.192 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site