PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pcie-intel-gw.c

diff --git a/drivers/pci/controller/dwc/pcie-intel-gw.c b/drivers/pci/controller/dwc/pcie-intel-gw.c
index 5650cb7..8878265 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-intel-gw.c
+++ b/drivers/pci/controller/dwc/pcie-intel-gw.c
@@ -58,7 +58,6 @@
 
 struct intel_pcie_soc {
        unsigned int    pcie_ver;
-       unsigned int    pcie_atu_offset;
        u32             num_viewport;
 };
 
@@ -155,11 +154,15 @@ static void intel_pcie_init_n_fts(struct dw_pcie *pci)
 
 static void intel_pcie_rc_setup(struct intel_pcie_port *lpp)
 {
+       struct dw_pcie *pci = &lpp->pci;
+
+       pci->atu_base = pci->dbi_base + 0xC0000;
+
        intel_pcie_ltssm_disable(lpp);
        intel_pcie_link_setup(lpp);
-       intel_pcie_init_n_fts(&lpp->pci);
-       dw_pcie_setup_rc(&lpp->pci.pp);
-       dw_pcie_upconfig_setup(&lpp->pci);
+       intel_pcie_init_n_fts(pci);
+       dw_pcie_setup_rc(&pci->pp);
+       dw_pcie_upconfig_setup(pci);
 }
 
 static int intel_pcie_ep_rst_init(struct intel_pcie_port *lpp)
@@ -234,10 +237,6 @@ static int intel_pcie_get_resources(struct platform_device *pdev)
        struct device *dev = pci->dev;
        int ret;
 
-       pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");
-       if (IS_ERR(pci->dbi_base))
-               return PTR_ERR(pci->dbi_base);
-
        lpp->core_clk = devm_clk_get(dev, NULL);
        if (IS_ERR(lpp->core_clk)) {
                ret = PTR_ERR(lpp->core_clk);
@@ -425,7 +424,6 @@ static const struct dw_pcie_host_ops intel_pcie_dw_ops = {
 
 static const struct intel_pcie_soc pcie_data = {
        .pcie_ver =             0x520A,
-       .pcie_atu_offset =      0xC0000,
        .num_viewport =         3,
 };
 
@@ -461,7 +459,6 @@ static int intel_pcie_probe(struct platform_device *pdev)
 
        pci->ops = &intel_pcie_ops;
        pci->version = data->pcie_ver;
-       pci->atu_base = pci->dbi_base + data->pcie_atu_offset;
        pp->ops = &intel_pcie_dw_ops;
 
        ret = dw_pcie_host_init(pp);