PCI: layerscape: Remove unused fields from struct ls_pcie

[karo-tx-linux.git] / drivers / pci / host / pci-layerscape.c

diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index b2328ea13dcfe1cad3ee232c8b45f7a66cda7984..7d61cbb9bab1e099f531b3a709e69d70e0355dec 100644 (file)
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/of_pci.h>
@@ -35,24 +34,39 @@
 /* Symbol Timer Register and Filter Mask Register 1 */
 #define PCIE_STRFMR1 0x71c
 
+struct ls_pcie_drvdata {
+       struct pcie_host_ops *ops;
+};
+
 struct ls_pcie {
-       struct list_head node;
-       struct device *dev;
-       struct pci_bus *bus;
        void __iomem *dbi;
        struct regmap *scfg;
        struct pcie_port pp;
+       const struct ls_pcie_drvdata *drvdata;
        int index;
        int msi_irq;
 };
 
 #define to_ls_pcie(x)  container_of(x, struct ls_pcie, pp)
 
-static int ls_pcie_link_up(struct pcie_port *pp)
+static bool ls_pcie_is_bridge(struct ls_pcie *pcie)
+{
+       u32 header_type;
+
+       header_type = ioread8(pcie->dbi + PCI_HEADER_TYPE);
+       header_type &= 0x7f;
+
+       return header_type == PCI_HEADER_TYPE_BRIDGE;
+}
+
+static int ls1021_pcie_link_up(struct pcie_port *pp)
 {
        u32 state;
        struct ls_pcie *pcie = to_ls_pcie(pp);
 
+       if (!pcie->scfg)
+               return 0;
+
        regmap_read(pcie->scfg, SCFG_PEXMSCPORTSR(pcie->index), &state);
        state = (state >> LTSSM_STATE_SHIFT) & LTSSM_STATE_MASK;
 
@@ -62,27 +76,27 @@ static int ls_pcie_link_up(struct pcie_port *pp)
        return 1;
 }
 
-static int ls_pcie_establish_link(struct pcie_port *pp)
+static void ls1021_pcie_host_init(struct pcie_port *pp)
 {
-       unsigned int retries;
+       struct ls_pcie *pcie = to_ls_pcie(pp);
+       u32 val, index[2];
 
-       for (retries = 0; retries < 200; retries++) {
-               if (dw_pcie_link_up(pp))
-                       return 0;
-               usleep_range(100, 1000);
+       pcie->scfg = syscon_regmap_lookup_by_phandle(pp->dev->of_node,
+                                                    "fsl,pcie-scfg");
+       if (IS_ERR(pcie->scfg)) {
+               dev_err(pp->dev, "No syscfg phandle specified\n");
+               pcie->scfg = NULL;
+               return;
        }
 
-       dev_err(pp->dev, "phy link never came up\n");
-       return -EINVAL;
-}
-
-static void ls_pcie_host_init(struct pcie_port *pp)
-{
-       struct ls_pcie *pcie = to_ls_pcie(pp);
-       u32 val;
+       if (of_property_read_u32_array(pp->dev->of_node,
+                                      "fsl,pcie-scfg", index, 2)) {
+               pcie->scfg = NULL;
+               return;
+       }
+       pcie->index = index[1];
 
        dw_pcie_setup_rc(pp);
-       ls_pcie_establish_link(pp);
 
        /*
         * LS1021A Workaround for internal TKT228622
@@ -93,21 +107,30 @@ static void ls_pcie_host_init(struct pcie_port *pp)
        iowrite32(val, pcie->dbi + PCIE_STRFMR1);
 }
 
-static struct pcie_host_ops ls_pcie_host_ops = {
-       .link_up = ls_pcie_link_up,
-       .host_init = ls_pcie_host_init,
+static struct pcie_host_ops ls1021_pcie_host_ops = {
+       .link_up = ls1021_pcie_link_up,
+       .host_init = ls1021_pcie_host_init,
+};
+
+static struct ls_pcie_drvdata ls1021_drvdata = {
+       .ops = &ls1021_pcie_host_ops,
+};
+
+static const struct of_device_id ls_pcie_of_match[] = {
+       { .compatible = "fsl,ls1021a-pcie", .data = &ls1021_drvdata },
+       { },
 };
+MODULE_DEVICE_TABLE(of, ls_pcie_of_match);
 
-static int ls_add_pcie_port(struct ls_pcie *pcie)
+static int __init ls_add_pcie_port(struct pcie_port *pp,
+                                  struct platform_device *pdev)
 {
-       struct pcie_port *pp;
        int ret;
+       struct ls_pcie *pcie = to_ls_pcie(pp);
 
-       pp = &pcie->pp;
-       pp->dev = pcie->dev;
+       pp->dev = &pdev->dev;
        pp->dbi_base = pcie->dbi;
-       pp->root_bus_nr = -1;
-       pp->ops = &ls_pcie_host_ops;
+       pp->ops = pcie->drvdata->ops;
 
        ret = dw_pcie_host_init(pp);
        if (ret) {
@@ -120,17 +143,19 @@ static int ls_add_pcie_port(struct ls_pcie *pcie)
 
 static int __init ls_pcie_probe(struct platform_device *pdev)
 {
+       const struct of_device_id *match;
        struct ls_pcie *pcie;
        struct resource *dbi_base;
-       u32 index[2];
        int ret;
 
+       match = of_match_device(ls_pcie_of_match, &pdev->dev);
+       if (!match)
+               return -ENODEV;
+
        pcie = devm_kzalloc(&pdev->dev, sizeof(*pcie), GFP_KERNEL);
        if (!pcie)
                return -ENOMEM;
 
-       pcie->dev = &pdev->dev;
-
        dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
        pcie->dbi = devm_ioremap_resource(&pdev->dev, dbi_base);
        if (IS_ERR(pcie->dbi)) {
@@ -138,20 +163,12 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
                return PTR_ERR(pcie->dbi);
        }
 
-       pcie->scfg = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
-                                                    "fsl,pcie-scfg");
-       if (IS_ERR(pcie->scfg)) {
-               dev_err(&pdev->dev, "No syscfg phandle specified\n");
-               return PTR_ERR(pcie->scfg);
-       }
+       pcie->drvdata = match->data;
 
-       ret = of_property_read_u32_array(pdev->dev.of_node,
-                                        "fsl,pcie-scfg", index, 2);
-       if (ret)
-               return ret;
-       pcie->index = index[1];
+       if (!ls_pcie_is_bridge(pcie))
+               return -ENODEV;
 
-       ret = ls_add_pcie_port(pcie);
+       ret = ls_add_pcie_port(&pcie->pp, pdev);
        if (ret < 0)
                return ret;
 
@@ -160,12 +177,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
        return 0;
 }
 
-static const struct of_device_id ls_pcie_of_match[] = {
-       { .compatible = "fsl,ls1021a-pcie" },
-       { },
-};
-MODULE_DEVICE_TABLE(of, ls_pcie_of_match);
-
 static struct platform_driver ls_pcie_driver = {
        .driver = {
                .name = "layerscape-pcie",