AM64: Add PCIe bindings and driver support
Subsystems (5)
v4 cover AM64: Add PCIe bindings and driver support
AM64 uses the same PCIe controller as in J7200, however AM642 EVM doesn't have a clock generator (unlike J7200 base board). Here the clock from the SERDES has to be routed to the PCIE connector. This series provides an option for the pci-j721e.c driver to drive reference clock output to the connector.
v1 of the patch series can be found @ [1]
v2 of the patch series can be found @ [2]
v3 of the patch series can be found @ [3]
Changes from v3:
*) Added Reviewed by from Rob
*) Incorporated Krzysztof Wilczyński comment on DT binding documentation *) Fixed "warn: missing error code 'ret'"
Changes from v2:
*) Fix DT binding documentation suggested by Rob
Changes from v1:
*) Fixed missing initialization of "ret" variable in the error path.
[1] -> http://lore.kernel.org/r/[email protected]
[2] -> https://lore.kernel.org/r/[email protected]
[3] -> https://lore.kernel.org/r/[email protected]
Kishon Vijay Abraham I (4):
dt-bindings: PCI: ti,j721e: Add binding to represent refclk to the
connector
dt-bindings: PCI: ti,j721e: Add host mode dt-bindings for TI's AM64
SoC
dt-bindings: PCI: ti,j721e: Add endpoint mode dt-bindings for TI's
AM64 SoC
PCI: j721e: Add support to provide refclk to PCIe connector
.../bindings/pci/ti,j721e-pci-ep.yaml | 9 ++++---- .../bindings/pci/ti,j721e-pci-host.yaml | 20 ++++++++++++----- drivers/pci/controller/cadence/pci-j721e.c | 22 ++++++++++++++++++- 3 files changed, 40 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/4 dt-bindings: PCI: ti,j721e: Add binding to represent refclk to the connector
Add binding to represent refclk to the PCIe connector.
--- .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml +7 -2
@@ -46,12 +46,17 @@ properties: maxItems: 1 clocks: - maxItems: 1 - description: clock-specifier to represent input to the PCIe + minItems: 1 + maxItems: 2 + description: |+ + clock-specifier to represent input to the PCIe for 1 item. + 2nd item if present represents reference clock to the connector. clock-names: + minItems: 1 items: - const: fck + - const: pcie_refclk vendor-id: const: 0x104c
Signature · 1 line
2.17.1
Re: [PATCH v4 1/4] dt-bindings: PCI: ti, j721e: Add binding to represent refclk to the connector
Quoted 7 lines · Kishon Vijay Abraham I
Add binding to represent refclk to the PCIe connector.
Signed-off-by Kishon Vijay Abraham I <[email protected]>--- .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
PATCH v4 2/4 dt-bindings: PCI: ti,j721e: Add host mode dt-bindings for TI's AM64 SoC
In reply to Kishon Vijay Abraham IAdd host mode dt-bindings for TI's AM64 SoC. This is the same IP used in J7200, however AM64 is a non-coherent architecture.
--- .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml +7 -4
@@ -16,12 +16,14 @@ allOf: properties: compatible: oneOf: - - description: PCIe controller in J7200 + - const: ti,j721e-pcie-host + - description: PCIe controller in AM64 items: - - const: ti,j7200-pcie-host + - const: ti,am64-pcie-host - const: ti,j721e-pcie-host - - description: PCIe controller in J721E + - description: PCIe controller in J7200 items: + - const: ti,j7200-pcie-host - const: ti,j721e-pcie-host reg:
@@ -67,6 +69,8 @@ properties: - const: 0xb00d - items: - const: 0xb00f + - items: + - const: 0xb010 msi-map: true
@@ -83,7 +87,6 @@ required: - vendor-id - device-id - msi-map - - dma-coherent - dma-ranges - ranges - reset-gpios
Signature · 1 line
2.17.1
PATCH v4 3/4 dt-bindings: PCI: ti,j721e: Add endpoint mode dt-bindings for TI's AM64 SoC
In reply to Kishon Vijay Abraham IAdd endpoint mode dt-bindings for TI's AM64 SoC. This is the same IP used in J7200, however AM64 is a non-coherent architecture.
--- .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml +5 -4
@@ -16,12 +16,14 @@ allOf: properties: compatible: oneOf: - - description: PCIe EP controller in J7200 + - const: ti,j721e-pcie-ep + - description: PCIe EP controller in AM64 items: - - const: ti,j7200-pcie-ep + - const: ti,am64-pcie-ep - const: ti,j721e-pcie-ep - - description: PCIe EP controller in J721E + - description: PCIe EP controller in J7200 items: + - const: ti,j7200-pcie-ep - const: ti,j721e-pcie-ep reg:
@@ -66,7 +68,6 @@ required: - power-domains - clocks - clock-names - - dma-coherent - max-functions - phys - phy-names
Signature · 1 line
2.17.1
PATCH v4 4/4 PCI: j721e: Add support to provide refclk to PCIe connector
In reply to Kishon Vijay Abraham IAdd support to provide refclk to PCIe connector.
--- drivers/pci/controller/cadence/pci-j721e.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/pci/controller/cadence/pci-j721e.c +21 -1
@@ -6,6 +6,7 @@* Author: Kishon Vijay Abraham I <[email protected]> */ +#include <linux/clk.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/io.h>
@@ -50,6 +51,7 @@ enum link_status {struct j721e_pcie {struct device *dev; +struct clk *refclk;u32 mode;u32 num_lanes;struct cdns_pcie *cdns_pcie;
@@ -310,6 +312,7 @@ static int j721e_pcie_probe(struct platform_device *pdev)struct cdns_pcie_ep *ep;struct gpio_desc *gpiod;void __iomem *base; +struct clk *clk;u32 num_lanes;u32 mode;int ret;
@@ -408,6 +411,20 @@ static int j721e_pcie_probe(struct platform_device *pdev) goto err_get_sync; } + clk =devm_clk_get_optional (dev,"pcie_refclk" ); +if (IS_ERR (clk)) { + ret =PTR_ERR (clk); +dev_err (dev,"failed to get pcie_refclk\n" ); + goto err_pcie_setup; + } + + ret =clk_prepare_enable (clk); +if (ret) { +dev_err (dev,"failed to enable pcie_refclk\n" ); + goto err_get_sync; + } + pcie->refclk = clk; +/* * "Power Sequencing and Reset Signal Timings" table in * PCI EXPRESS CARD ELECTROMECHANICAL SPECIFICATION, REV. 3.0
@@ -422,8 +439,10 @@ static int j721e_pcie_probe(struct platform_device *pdev) } ret =cdns_pcie_host_setup (rc); -if (ret <0 ) +if (ret <0 ) { +clk_disable_unprepare (pcie->refclk); goto err_pcie_setup; + }break ;case PCI_MODE_EP :
@@ -476,6 +495,7 @@ static int j721e_pcie_remove(struct platform_device *pdev)struct cdns_pcie *cdns_pcie = pcie->cdns_pcie;struct device *dev = &pdev->dev; +clk_disable_unprepare (pcie->refclk);cdns_pcie_disable_phy (cdns_pcie);pm_runtime_put (dev);pm_runtime_disable (dev);
Signature · 1 line
2.17.1
Lorenzo Pieralisi
AppliedQuoted 11 lines · Kishon Vijay Abraham I
AM64 uses the same PCIe controller as in J7200, however AM642 EVM doesn't have a clock generator (unlike J7200 base board). Here the clock from the SERDES has to be routed to the PCIE connector. This series provides an option for the
pci-j721e.cdriver to drive reference clock output to the connector.v1 of the patch series can be found @ [1]
v2 of the patch series can be found @ [2]
v3 of the patch series can be found @ [3][...]
Applied to pci/cadence, thanks!
[1/4] dt-bindings: PCI: ti,j721e: Add binding to represent refclk to the connector
https://git.kernel.org/lpieralisi/pci/c/f9875d1a36 [2/4] dt-bindings: PCI: ti,j721e: Add host mode dt-bindings for TI's AM64 SoC https://git.kernel.org/lpieralisi/pci/c/3201f355e9 [3/4] dt-bindings: PCI: ti,j721e: Add endpoint mode dt-bindings for TI's AM64 SoC https://git.kernel.org/lpieralisi/pci/c/6b7d5394c2 [4/4] PCI: j721e: Add support to provide refclk to PCIe connector https://git.kernel.org/lpieralisi/pci/c/49e0efdce7
Thanks,
Lorenzo