Skip to contentSkip to conversation

PCIe: imx6: imx7d: add support for internal phy refclk source

PATCH In review André Draszik 2 participants 4 messages Aug 13, 2019 – Aug 28, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 PCIe: imx6: imx7d: add support for internal phy refclk source

The i.MX7D variant of the IP can use either an external crystal oscillator input or an internal clock input as a reference clock input for the PCIe PHY.

Add support for an optional property 'fsl,pcie-phy-refclk-internal' If present then the internal clock input is used as
PCIe PHY reference clock source. The previous default
of using an external ocsillator input (if the property doesn't exist), doesn't change.

Cc Richard Zhu <[email protected]>
Cc Lucas Stach <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
---
 drivers/pci/controller/dwc/pci-imx6.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pci-imx6.c +8 -1
index 9b5cb5b70389..bb3700c9157c 100644
@@ -63,6 +63,7 @@ struct imx6_pcie {
 	struct dw_pcie		*pci;
 	int			reset_gpio;
 	bool			gpio_active_high;
+	bool			phy_refclk_internal;
 	struct clk		*pcie_bus;
 	struct clk		*pcie_phy;
 	struct clk		*pcie_inbound_axi;
@@ -635,7 +636,10 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
 		break;
 	case IMX7D:
 		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
-				   IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, 0);
+				   IMX7D_GPR12_PCIE_PHY_REFCLK_SEL,
+				   imx6_pcie->phy_refclk_internal
+				   ? IMX7D_GPR12_PCIE_PHY_REFCLK_SEL
+				   : 0);
 		break;
 	case IMX6SX:
 		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
@@ -1171,6 +1175,9 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		imx6_pcie->link_gen = 1;
 
+	imx6_pcie->phy_refclk_internal =
+		of_property_read_bool(node, "fsl,pcie-phy-refclk-internal");
+
 	imx6_pcie->vpcie = devm_regulator_get_optional(&pdev->dev, "vpcie");
 	if (IS_ERR(imx6_pcie->vpcie)) {
 		if (PTR_ERR(imx6_pcie->vpcie) == -EPROBE_DEFER)
Signature · 1 line
2.23.0.rc1
#1 lore raw

PATCH 2/2 dt-bindings: imx6q-pcie: add "fsl,pcie-phy-refclk-internal" for i.MX7D

The i.MX7D variant of the IP can use either an external crystal oscillator input or an internal clock input as a reference clock input for the PCIe PHY.

Document the optional property 'fsl,pcie-phy-refclk-internal'

Cc Richard Zhu <[email protected]>
Cc Lucas Stach <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
---
 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +5 -0
index a7f5f5afa0e6..985d7083df9f 100644
@@ -56,6 +56,11 @@ Additional required properties for imx7d-pcie and imx8mq-pcie:
 	       - "turnoff"
 - fsl,imx7d-pcie-phy: A phandle to an fsl,imx7d-pcie-phy node.
 
+Additional optional properties for imx7d-pcie:
+- fsl,pcie-phy-refclk-internal: If present then an internal PLL input is used
+  as PCIe PHY reference clock source. By default an external ocsillator input
+  is used.
+
 Additional required properties for imx8mq-pcie:
 - clock-names: Must include the following additional entries:
 	- "pcie_aux"
Signature · 1 line
2.23.0.rc1
maintainer
#2 lore raw

Re: [PATCH 2/2] dt-bindings: imx6q-pcie: add "fsl,pcie-phy-refclk-internal" for i.MX7D

Quoted 30 lines · André Draszik

The i.MX7D variant of the IP can use either an external crystal oscillator input or an internal clock input as a reference clock input for the PCIe PHY.

Document the optional property 'fsl,pcie-phy-refclk-internal'

Cc Richard Zhu <[email protected]>
Cc Lucas Stach <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
---
 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +0 -0
index a7f5f5afa0e6..985d7083df9f 100644

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt Additional required properties for imx7d-pcie and imx8mq-pcie: · line 57

Quoted 2 lines
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +0 -0
@@ -56,6 +56,11 @@ Additional required properties for imx7d-pcie and imx8mq-pcie:
 	       - "turnoff"
 - fsl,imx7d-pcie-phy: A phandle to an fsl,imx7d-pcie-phy node.

Not sure how this got in, but why is the phy binding not used here?

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt Additional required properties for imx7d-pcie and imx8mq-pcie: · line 62

Quoted 5 lines
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +4 -0
+Additional optional properties for imx7d-pcie:
+- fsl,pcie-phy-refclk-internal: If present then an internal PLL input is used
+  as PCIe PHY reference clock source. By default an external ocsillator input
+  is used.

Can't the clock binding and maybe 'assigned-clocks' be used here?

Also, this is a property of the PHY, so it belongs in the PHY's node.

Rob

#3 lore raw

Re: [PATCH 2/2] dt-bindings: imx6q-pcie: add "fsl,pcie-phy-refclk-internal" for i.MX7D

Hi Rob,

Quoted 38 lines · Rob Herring
Quoted 31 lines · André Draszik

The i.MX7D variant of the IP can use either an external crystal oscillator input or an internal clock input as a reference clock input for the PCIe PHY.

Document the optional property 'fsl,pcie-phy-refclk-internal'

Cc Richard Zhu <[email protected]>
Cc Lucas Stach <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
---
 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +0 -0
index a7f5f5afa0e6..985d7083df9f 100644

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt Additional required properties for imx7d-pcie and imx8mq-pcie: · line 57

Quoted 2 lines
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +0 -0
@@ -56,6 +56,11 @@ Additional required properties for imx7d-pcie and imx8mq-pcie:
 	       - "turnoff"
 - fsl,imx7d-pcie-phy: A phandle to an fsl,imx7d-pcie-phy node.

Not sure how this got in, but why is the phy binding not used here?

Quoted 1 line
Quoted 8 lines

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt Additional required properties for imx7d-pcie and imx8mq-pcie: · line 62

Quoted 4 lines
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +4 -0
+Additional optional properties for imx7d-pcie:
+- fsl,pcie-phy-refclk-internal: If present then an internal PLL input is used
+  as PCIe PHY reference clock source. By default an external ocsillator input
+  is used.

Can't the clock binding and maybe 'assigned-clocks' be used here?

Also, this is a property of the PHY, so it belongs in the PHY's node.

Thanks for pointing this out. I'll have a look.

Andre'