Commit b1dee41b authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

PCI: keystone: Move resources initialization to prepare for EP support 



Move platform_get_resource() calls for resources that are applicable to
both host and endpoint mode (ie "dbics" and "app") from
ks_add_pcie_port() to the probe() callback, in preparation for adding
endpoint support to pci-keystone driver.

No functional change intended.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 2341ab4f

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

+15 −12
Original line number Diff line number Diff line
@@ -806,11 +806,6 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie, 
	struct resource *res;

	int ret;



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

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

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



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

	pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(pp->va_cfg0_base))
@@ -818,13 +813,6 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie, 


	pp->va_cfg1_base = pp->va_cfg0_base;



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

	ks_pcie->va_app_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(ks_pcie->va_app_base))

		return PTR_ERR(ks_pcie->va_app_base);



	ks_pcie->app = *res;



	pp->ops = &ks_pcie_host_ops;

	ret = dw_pcie_host_init(pp);

	if (ret) {
@@ -895,6 +883,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	struct dw_pcie *pci;

	struct keystone_pcie *ks_pcie;

	struct device_link **link;

	struct resource *res;

	void __iomem *base;

	u32 num_viewport;

	struct phy **phy;

	u32 num_lanes;
@@ -911,6 +901,19 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	if (!pci)

		return -ENOMEM;



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

	ks_pcie->va_app_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(ks_pcie->va_app_base))

		return PTR_ERR(ks_pcie->va_app_base);



	ks_pcie->app = *res;



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

	base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(base))

		return PTR_ERR(base);



	pci->dbi_base = base;

	pci->dev = dev;

	pci->ops = &ks_pcie_dw_pcie_ops;