Commit 3ec17ca6 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/cadence' 

- Add DT binding and TI j721e support for refclk to PCIe connector (Kishon
  Vijay Abraham I)

- Add host mode and endpoint mode DT bindings for TI AM64 SoC (Kishon Vijay
  Abraham I)

* remotes/lorenzo/pci/cadence:
  PCI: j721e: Add support to provide refclk to PCIe connector
  dt-bindings: PCI: ti,j721e: Add endpoint mode dt-bindings for TI's AM64 SoC
  dt-bindings: PCI: ti,j721e: Add host mode dt-bindings for TI's AM64 SoC
  dt-bindings: PCI: ti,j721e: Add binding to represent refclk to the connector
parents 531a953d 49e0efdc

Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml

+5 −4
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml

+14 −6
Original line number Diff line number Diff line
@@ -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:
@@ -46,12 +48,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
@@ -62,6 +69,8 @@ properties: 
          - const: 0xb00d

      - items:

          - const: 0xb00f

      - items:

          - const: 0xb010



  msi-map: true
@@ -78,7 +87,6 @@ required: 
  - vendor-id

  - device-id

  - msi-map

  - dma-coherent

  - dma-ranges

  - ranges

  - reset-gpios

drivers/pci/controller/cadence/pci-j721e.c

+21 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Author: Kishon Vijay Abraham I <kishon@ti.com>

 */



#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;
@@ -312,6 +314,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;
@@ -411,6 +414,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
@@ -425,8 +442,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:
@@ -479,6 +498,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);