2021-06-04 02:07:42

by Richard Zhu

Subject: [RESEND, V5 0/2] add one regulator used to power up pcie phy

Changes v4->v5:
- Refine the commit logs refer to bhelgaas' comments.
- Resend v5 patch-set after CC "[email protected]"
in the mail-list.

v4:
https://patchwork.kernel.org/project/linux-pci/patch/[email protected]/

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 +++
drivers/pci/controller/dwc/pci-imx6.c | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+)

[RESEND, V5 1/2] dt-bindings: imx6q-pcie: Add "vph-supply" for PHY
[RESEND, V5 2/2] PCI: imx6: Enable PHY internal regulator when

2021-06-04 02:08:27

by Richard Zhu

Subject: [RESEND, V5 2/2] PCI: imx6: Enable PHY internal regulator when supplied >3V

The i.MX8MQ PCIe PHY needs 1.8V in default but can be supplied by
either a 1.8V or a 3.3V regulator.

The "vph-supply" DT property tells us which external regulator
supplies the PHY. If that regulator supplies anything over 3V,
enable the PHY's internal 3.3V-to-1.8V regulator.

Signed-off-by: Richard Zhu <[email protected]>
Reviewed-by: Lucas Stach <[email protected]>
---
drivers/pci/controller/dwc/pci-imx6.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 853ea8e82952..94b43b4ecca1 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -37,6 +37,7 @@
#define IMX8MQ_GPR_PCIE_REF_USE_PAD BIT(9)
#define IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN BIT(10)
#define IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE BIT(11)
+#define IMX8MQ_GPR_PCIE_VREG_BYPASS BIT(12)
#define IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE GENMASK(11, 8)
#define IMX8MQ_PCIE2_BASE_ADDR 0x33c00000

@@ -80,6 +81,7 @@ struct imx6_pcie {
u32 tx_swing_full;
u32 tx_swing_low;
struct regulator *vpcie;
+ struct regulator *vph;
void __iomem *phy_base;

/* power domain for pcie */
@@ -621,6 +623,17 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
imx6_pcie_grp_offset(imx6_pcie),
IMX8MQ_GPR_PCIE_REF_USE_PAD,
IMX8MQ_GPR_PCIE_REF_USE_PAD);
+ /*
+ * Regarding the datasheet, the PCIE_VPH is suggested
+ * to be 1.8V. If the PCIE_VPH is supplied by 3.3V, the
+ * VREG_BYPASS should be cleared to zero.
+ */
+ if (imx6_pcie->vph &&
+ regulator_get_voltage(imx6_pcie->vph) > 3000000)
+ regmap_update_bits(imx6_pcie->iomuxc_gpr,
+ imx6_pcie_grp_offset(imx6_pcie),
+ IMX8MQ_GPR_PCIE_VREG_BYPASS,
+ 0);
break;
case IMX7D:
regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
@@ -1130,6 +1143,13 @@ static int imx6_pcie_probe(struct platform_device *pdev)
imx6_pcie->vpcie = NULL;
}

+ imx6_pcie->vph = devm_regulator_get_optional(&pdev->dev, "vph");
+ if (IS_ERR(imx6_pcie->vph)) {
+ if (PTR_ERR(imx6_pcie->vph) != -ENODEV)
+ return PTR_ERR(imx6_pcie->vph);
+ imx6_pcie->vph = NULL;
+ }
+
platform_set_drvdata(pdev, imx6_pcie);

ret = imx6_pcie_attach_pd(dev);
--
2.17.1

2021-06-22 10:28:05

by Lorenzo Pieralisi

Subject: Re: [RESEND, V5 0/2] add one regulator used to power up pcie phy

On Fri, 4 Jun 2021 09:47:47 +0800, Richard Zhu wrote:
> Changes v4->v5:
> - Refine the commit logs refer to bhelgaas' comments.
> - Resend v5 patch-set after CC "[email protected]"
> in the mail-list.
>
> v4:
> https://patchwork.kernel.org/project/linux-pci/patch/[email protected]/
>
> [...]

Applied to pci/imx6, thanks!

[1/2] dt-bindings: imx6q-pcie: Add "vph-supply" for PHY supply voltage
https://git.kernel.org/lpieralisi/pci/c/6d78fb2ea5
[2/2] PCI: imx6: Enable PHY internal regulator when supplied >3V
https://git.kernel.org/lpieralisi/pci/c/a9560daaa3

Thanks,
Lorenzo