PCI: dwc: Move dw_pcie_setup_rc() to DWC common code

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pcie-designware-plat.c

diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
index e3e3006..9b397c8 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-plat.c
+++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
@@ -33,25 +33,7 @@ struct dw_plat_pcie_of_data {
 
 static const struct of_device_id dw_plat_pcie_of_match[];
 
-static int dw_plat_pcie_host_init(struct pcie_port *pp)
-{
-       struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
-
-       dw_pcie_setup_rc(pp);
-       dw_pcie_wait_for_link(pci);
-       dw_pcie_msi_init(pp);
-
-       return 0;
-}
-
-static void dw_plat_set_num_vectors(struct pcie_port *pp)
-{
-       pp->num_vectors = MAX_MSI_IRQS;
-}
-
 static const struct dw_pcie_host_ops dw_plat_pcie_host_ops = {
-       .host_init = dw_plat_pcie_host_init,
-       .set_num_vectors = dw_plat_set_num_vectors,
 };
 
 static int dw_plat_pcie_establish_link(struct dw_pcie *pci)
@@ -122,12 +104,7 @@ static int dw_plat_add_pcie_port(struct dw_plat_pcie *dw_plat_pcie,
        if (pp->irq < 0)
                return pp->irq;
 
-       if (IS_ENABLED(CONFIG_PCI_MSI)) {
-               pp->msi_irq = platform_get_irq(pdev, 0);
-               if (pp->msi_irq < 0)
-                       return pp->msi_irq;
-       }
-
+       pp->num_vectors = MAX_MSI_IRQS;
        pp->ops = &dw_plat_pcie_host_ops;
 
        ret = dw_pcie_host_init(pp);
@@ -139,43 +116,11 @@ static int dw_plat_add_pcie_port(struct dw_plat_pcie *dw_plat_pcie,
        return 0;
 }
 
-static int dw_plat_add_pcie_ep(struct dw_plat_pcie *dw_plat_pcie,
-                              struct platform_device *pdev)
-{
-       int ret;
-       struct dw_pcie_ep *ep;
-       struct resource *res;
-       struct device *dev = &pdev->dev;
-       struct dw_pcie *pci = dw_plat_pcie->pci;
-
-       ep = &pci->ep;
-       ep->ops = &pcie_ep_ops;
-
-       pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");
-       if (IS_ERR(pci->dbi_base2))
-               return PTR_ERR(pci->dbi_base2);
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
-       if (!res)
-               return -EINVAL;
-
-       ep->phys_base = res->start;
-       ep->addr_size = resource_size(res);
-
-       ret = dw_pcie_ep_init(ep);
-       if (ret) {
-               dev_err(dev, "Failed to initialize endpoint\n");
-               return ret;
-       }
-       return 0;
-}
-
 static int dw_plat_pcie_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct dw_plat_pcie *dw_plat_pcie;
        struct dw_pcie *pci;
-       struct resource *res;  /* Resource from DT */
        int ret;
        const struct of_device_id *match;
        const struct dw_plat_pcie_of_data *data;
@@ -202,14 +147,6 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
        dw_plat_pcie->pci = pci;
        dw_plat_pcie->mode = mode;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
-       if (!res)
-               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-       pci->dbi_base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(pci->dbi_base))
-               return PTR_ERR(pci->dbi_base);
-
        platform_set_drvdata(pdev, dw_plat_pcie);
 
        switch (dw_plat_pcie->mode) {
@@ -225,9 +162,8 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
                if (!IS_ENABLED(CONFIG_PCIE_DW_PLAT_EP))
                        return -ENODEV;
 
-               ret = dw_plat_add_pcie_ep(dw_plat_pcie, pdev);
-               if (ret < 0)
-                       return ret;
+               pci->ep.ops = &pcie_ep_ops;
+               return dw_pcie_ep_init(&pci->ep);
                break;
        default:
                dev_err(dev, "INVALID device type %d\n", dw_plat_pcie->mode);