Commit 26418025 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/dwc' 

- Add qcom ipq806x support (Ansuel Smith)

- Support max-link-speed DT property for qcom (Sham Muthayyan)

- Use PCI core #defines instead of adding qcom-specific ones (Ansuel Smith)

- Convert to devm_platform_ioremap_resource_byname() instead of open-coding
  platform_get_resource_byname() and devm_ioremap_resource() for dra7xx,
  keystone, artpec6, designware-plat, histb, intel-gw, kirin, qcom,
  uniphier (Dejin Zheng)

- Remove non-ECAM HiSilicon hip05/hip06 driver (Rob Herring)

* remotes/lorenzo/pci/dwc:
  PCI: dwc: hisi: Remove non-ECAM HiSilicon hip05/hip06 driver
  PCI: dwc: Convert to devm_platform_ioremap_resource_byname()
  PCI: qcom: Replace define with standard value
  PCI: qcom: Support pci speed set for ipq806x
  dt-bindings: PCI: qcom: Add ipq8064 rev 2 variant
  PCI: qcom: Add ipq8064 rev2 variant
  PCI: qcom: Add support for tx term offset for rev 2.1.0
  PCI: qcom: Define some PARF params needed for ipq8064 SoC
  PCI: qcom: Use bulk clk api and assert on error
  dt-bindings: PCI: qcom: Add ext reset
  PCI: qcom: Add missing reset for ipq806x
  PCI: qcom: Change duplicate PCI reset to phy reset
  dt-bindings: PCI: qcom: Add missing clks
  PCI: qcom: Add missing ipq806x clocks in PCIe driver
parents 13a77336 c2fa6cf7

Documentation/devicetree/bindings/pci/qcom,pcie.txt

+11 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
	Value type: <stringlist>

	Definition: Value should contain

			- "qcom,pcie-ipq8064" for ipq8064

			- "qcom,pcie-ipq8064-v2" for ipq8064 rev 2 or ipq8065

			- "qcom,pcie-apq8064" for apq8064

			- "qcom,pcie-apq8084" for apq8084

			- "qcom,pcie-msm8996" for msm8996 or apq8096
@@ -90,6 +91,8 @@ 
	Definition: Should contain the following entries

			- "core"	Clocks the pcie hw block

			- "phy"		Clocks the pcie PHY block

			- "aux" 	Clocks the pcie AUX block

			- "ref" 	Clocks the pcie ref block

- clock-names:

	Usage: required for apq8084/ipq4019

	Value type: <stringlist>
@@ -177,6 +180,7 @@ 
			- "pwr"			PWR reset

			- "ahb"			AHB reset

			- "phy_ahb"		PHY AHB reset

			- "ext"			EXT reset



- reset-names:

	Usage: required for ipq8074
@@ -277,14 +281,17 @@ 
				<0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */

		clocks = <&gcc PCIE_A_CLK>,

			 <&gcc PCIE_H_CLK>,

			 <&gcc PCIE_PHY_CLK>;

		clock-names = "core", "iface", "phy";

			 <&gcc PCIE_PHY_CLK>,

			 <&gcc PCIE_AUX_CLK>,

			 <&gcc PCIE_ALT_REF_CLK>;

		clock-names = "core", "iface", "phy", "aux", "ref";

		resets = <&gcc PCIE_ACLK_RESET>,

			 <&gcc PCIE_HCLK_RESET>,

			 <&gcc PCIE_POR_RESET>,

			 <&gcc PCIE_PCI_RESET>,

			 <&gcc PCIE_PHY_RESET>;

		reset-names = "axi", "ahb", "por", "pci", "phy";

			 <&gcc PCIE_PHY_RESET>,

			 <&gcc PCIE_EXT_RESET>;

		reset-names = "axi", "ahb", "por", "pci", "phy", "ext";

		pinctrl-0 = <&pcie_pins_default>;

		pinctrl-names = "default";

	};

drivers/pci/controller/dwc/pci-dra7xx.c

+4 −7
Original line number Diff line number Diff line
@@ -593,13 +593,12 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics");

	pci->dbi_base = devm_ioremap_resource(dev, res);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "ep_dbics");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 =

		devm_platform_ioremap_resource_byname(pdev, "ep_dbics2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);
@@ -626,7 +625,6 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	struct dw_pcie *pci = dra7xx->pci;

	struct pcie_port *pp = &pci->pp;

	struct device *dev = pci->dev;

	struct resource *res;



	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {
@@ -638,8 +636,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	if (ret < 0)

		return ret;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");

	pci->dbi_base = devm_ioremap_resource(dev, res);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc_dbics");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);

drivers/pci/controller/dwc/pci-keystone.c

+1 −2
Original line number Diff line number Diff line
@@ -1323,8 +1323,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	}



	if (pci->version >= 0x480A) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");

		atu_base = devm_ioremap_resource(dev, res);

		atu_base = devm_platform_ioremap_resource_byname(pdev, "atu");

		if (IS_ERR(atu_base)) {

			ret = PTR_ERR(atu_base);

			goto err_get_sync;

drivers/pci/controller/dwc/pcie-artpec6.c

+4 −8
Original line number Diff line number Diff line
@@ -455,8 +455,7 @@ static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);
@@ -481,8 +480,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct dw_pcie *pci;

	struct artpec6_pcie *artpec6_pcie;

	struct resource *dbi_base;

	struct resource *phy_base;

	int ret;

	const struct of_device_id *match;

	const struct artpec_pcie_of_data *data;
@@ -512,13 +509,12 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	artpec6_pcie->variant = variant;

	artpec6_pcie->mode = mode;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pci->dbi_base = devm_ioremap_resource(dev, dbi_base);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");

	artpec6_pcie->phy_base = devm_ioremap_resource(dev, phy_base);

	artpec6_pcie->phy_base =

		devm_platform_ioremap_resource_byname(pdev, "phy");

	if (IS_ERR(artpec6_pcie->phy_base))

		return PTR_ERR(artpec6_pcie->phy_base);

drivers/pci/controller/dwc/pcie-designware-plat.c

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static int dw_plat_add_pcie_ep(struct dw_plat_pcie *dw_plat_pcie, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);