PCI: qcom: Use block IP version for operations

Presently, when support for a new SoC is added, the driver ops structures
and functions are versioned with plain 1, 2, 3 etc.  Instead use the block
IP version number.

Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>

diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index 871e7d93cbf6e11fa27ca2a9d88a010f0d80bec3..4ec5cd9868702191a4130d7ca77abd85ae14bcd8 100644 (file)
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -61,7 +61,7 @@
 
 #define PERST_DELAY_US                         1000
 
-struct qcom_pcie_resources_v0 {
+struct qcom_pcie_resources_2_1_0 {
        struct clk *iface_clk;
        struct clk *core_clk;
        struct clk *phy_clk;
@@ -75,7 +75,7 @@ struct qcom_pcie_resources_v0 {
        struct regulator *vdda_refclk;
 };
 
-struct qcom_pcie_resources_v1 {
+struct qcom_pcie_resources_1_0_0 {
        struct clk *iface;
        struct clk *aux;
        struct clk *master_bus;
@@ -84,7 +84,7 @@ struct qcom_pcie_resources_v1 {
        struct regulator *vdda;
 };
 
-struct qcom_pcie_resources_v2 {
+struct qcom_pcie_resources_2_3_2 {
        struct clk *aux_clk;
        struct clk *master_clk;
        struct clk *slave_clk;
@@ -92,7 +92,7 @@ struct qcom_pcie_resources_v2 {
        struct clk *pipe_clk;
 };
 
-struct qcom_pcie_resources_v3 {
+struct qcom_pcie_resources_2_4_0 {
        struct clk *aux_clk;
        struct clk *master_clk;
        struct clk *slave_clk;
@@ -111,10 +111,10 @@ struct qcom_pcie_resources_v3 {
 };
 
 union qcom_pcie_resources {
-       struct qcom_pcie_resources_v0 v0;
-       struct qcom_pcie_resources_v1 v1;
-       struct qcom_pcie_resources_v2 v2;
-       struct qcom_pcie_resources_v3 v3;
+       struct qcom_pcie_resources_1_0_0 v1_0_0;
+       struct qcom_pcie_resources_2_1_0 v2_1_0;
+       struct qcom_pcie_resources_2_3_2 v2_3_2;
+       struct qcom_pcie_resources_2_4_0 v2_4_0;
 };
 
 struct qcom_pcie;
@@ -173,7 +173,7 @@ static int qcom_pcie_establish_link(struct qcom_pcie *pcie)
        return dw_pcie_wait_for_link(pci);
 }
 
-static void qcom_pcie_v0_v1_ltssm_enable(struct qcom_pcie *pcie)
+static void qcom_pcie_2_1_0_ltssm_enable(struct qcom_pcie *pcie)
 {
        u32 val;
 
@@ -183,9 +183,9 @@ static void qcom_pcie_v0_v1_ltssm_enable(struct qcom_pcie *pcie)
        writel(val, pcie->elbi + PCIE20_ELBI_SYS_CTRL);
 }
 
-static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
+static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
+       struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
 
@@ -233,9 +233,9 @@ static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
        return PTR_ERR_OR_ZERO(res->phy_reset);
 }
 
-static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
+static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
+       struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;
 
        reset_control_assert(res->pci_reset);
        reset_control_assert(res->axi_reset);
@@ -250,9 +250,9 @@ static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
        regulator_disable(res->vdda_refclk);
 }
 
-static int qcom_pcie_init_v0(struct qcom_pcie *pcie)
+static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
+       struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
        u32 val;
@@ -368,9 +368,9 @@ err_refclk:
        return ret;
 }
 
-static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
+static int qcom_pcie_get_resources_1_0_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
+       struct qcom_pcie_resources_1_0_0 *res = &pcie->res.v1_0_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
 
@@ -398,9 +398,9 @@ static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
        return PTR_ERR_OR_ZERO(res->core);
 }
 
-static void qcom_pcie_deinit_v1(struct qcom_pcie *pcie)
+static void qcom_pcie_deinit_1_0_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
+       struct qcom_pcie_resources_1_0_0 *res = &pcie->res.v1_0_0;
 
        reset_control_assert(res->core);
        clk_disable_unprepare(res->slave_bus);
@@ -410,9 +410,9 @@ static void qcom_pcie_deinit_v1(struct qcom_pcie *pcie)
        regulator_disable(res->vdda);
 }
 
-static int qcom_pcie_init_v1(struct qcom_pcie *pcie)
+static int qcom_pcie_init_1_0_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
+       struct qcom_pcie_resources_1_0_0 *res = &pcie->res.v1_0_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
        int ret;
@@ -478,7 +478,7 @@ err_res:
        return ret;
 }
 
-static void qcom_pcie_v2_ltssm_enable(struct qcom_pcie *pcie)
+static void qcom_pcie_2_3_2_ltssm_enable(struct qcom_pcie *pcie)
 {
        u32 val;
 
@@ -488,9 +488,9 @@ static void qcom_pcie_v2_ltssm_enable(struct qcom_pcie *pcie)
        writel(val, pcie->parf + PCIE20_PARF_LTSSM);
 }
 
-static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie)
+static int qcom_pcie_get_resources_2_3_2(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
+       struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
 
@@ -514,9 +514,9 @@ static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie)
        return PTR_ERR_OR_ZERO(res->pipe_clk);
 }
 
-static void qcom_pcie_deinit_v2(struct qcom_pcie *pcie)
+static void qcom_pcie_deinit_2_3_2(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
+       struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;
 
        clk_disable_unprepare(res->slave_clk);
        clk_disable_unprepare(res->master_clk);
@@ -524,16 +524,16 @@ static void qcom_pcie_deinit_v2(struct qcom_pcie *pcie)
        clk_disable_unprepare(res->aux_clk);
 }
 
-static void qcom_pcie_post_deinit_v2(struct qcom_pcie *pcie)
+static void qcom_pcie_post_deinit_2_3_2(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
+       struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;
 
        clk_disable_unprepare(res->pipe_clk);
 }
 
-static int qcom_pcie_init_v2(struct qcom_pcie *pcie)
+static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
+       struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
        u32 val;
@@ -596,9 +596,9 @@ err_cfg_clk:
        return ret;
 }
 
-static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie)
+static int qcom_pcie_post_init_2_3_2(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
+       struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
        int ret;
@@ -612,9 +612,9 @@ static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie)
        return 0;
 }
 
-static int qcom_pcie_get_resources_v3(struct qcom_pcie *pcie)
+static int qcom_pcie_get_resources_2_4_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v3 *res = &pcie->res.v3;
+       struct qcom_pcie_resources_2_4_0 *res = &pcie->res.v2_4_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
 
@@ -685,9 +685,9 @@ static int qcom_pcie_get_resources_v3(struct qcom_pcie *pcie)
        return 0;
 }
 
-static void qcom_pcie_deinit_v3(struct qcom_pcie *pcie)
+static void qcom_pcie_deinit_2_4_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v3 *res = &pcie->res.v3;
+       struct qcom_pcie_resources_2_4_0 *res = &pcie->res.v2_4_0;
 
        reset_control_assert(res->axi_m_reset);
        reset_control_assert(res->axi_s_reset);
@@ -703,9 +703,9 @@ static void qcom_pcie_deinit_v3(struct qcom_pcie *pcie)
        clk_disable_unprepare(res->slave_clk);
 }
 
-static int qcom_pcie_init_v3(struct qcom_pcie *pcie)
+static int qcom_pcie_init_2_4_0(struct qcom_pcie *pcie)
 {
-       struct qcom_pcie_resources_v3 *res = &pcie->res.v3;
+       struct qcom_pcie_resources_2_4_0 *res = &pcie->res.v2_4_0;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
        u32 val;
@@ -969,38 +969,42 @@ static const struct dw_pcie_host_ops qcom_pcie_dw_ops = {
        .rd_own_conf = qcom_pcie_rd_own_conf,
 };
 
-static const struct qcom_pcie_ops ops_v0 = {
-       .get_resources = qcom_pcie_get_resources_v0,
-       .init = qcom_pcie_init_v0,
-       .deinit = qcom_pcie_deinit_v0,
-       .ltssm_enable = qcom_pcie_v0_v1_ltssm_enable,
+/* Qcom IP rev.: 2.1.0 Synopsys IP rev.: 4.01a */
+static const struct qcom_pcie_ops ops_2_1_0 = {
+       .get_resources = qcom_pcie_get_resources_2_1_0,
+       .init = qcom_pcie_init_2_1_0,
+       .deinit = qcom_pcie_deinit_2_1_0,
+       .ltssm_enable = qcom_pcie_2_1_0_ltssm_enable,
 };
 
-static const struct qcom_pcie_ops ops_v1 = {
-       .get_resources = qcom_pcie_get_resources_v1,
-       .init = qcom_pcie_init_v1,
-       .deinit = qcom_pcie_deinit_v1,
-       .ltssm_enable = qcom_pcie_v0_v1_ltssm_enable,
+/* Qcom IP rev.: 1.0.0 Synopsys IP rev.: 4.11a */
+static const struct qcom_pcie_ops ops_1_0_0 = {
+       .get_resources = qcom_pcie_get_resources_1_0_0,
+       .init = qcom_pcie_init_1_0_0,
+       .deinit = qcom_pcie_deinit_1_0_0,
+       .ltssm_enable = qcom_pcie_2_1_0_ltssm_enable,
 };
 
-static const struct qcom_pcie_ops ops_v2 = {
-       .get_resources = qcom_pcie_get_resources_v2,
-       .init = qcom_pcie_init_v2,
-       .post_init = qcom_pcie_post_init_v2,
-       .deinit = qcom_pcie_deinit_v2,
-       .post_deinit = qcom_pcie_post_deinit_v2,
-       .ltssm_enable = qcom_pcie_v2_ltssm_enable,
+/* Qcom IP rev.: 2.3.2 Synopsys IP rev.: 4.21a */
+static const struct qcom_pcie_ops ops_2_3_2 = {
+       .get_resources = qcom_pcie_get_resources_2_3_2,
+       .init = qcom_pcie_init_2_3_2,
+       .post_init = qcom_pcie_post_init_2_3_2,
+       .deinit = qcom_pcie_deinit_2_3_2,
+       .post_deinit = qcom_pcie_post_deinit_2_3_2,
+       .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
 };
 
-static const struct dw_pcie_ops dw_pcie_ops = {
-       .link_up = qcom_pcie_link_up,
+/* Qcom IP rev.: 2.4.0 Synopsys IP rev.: 4.20a */
+static const struct qcom_pcie_ops ops_2_4_0 = {
+       .get_resources = qcom_pcie_get_resources_2_4_0,
+       .init = qcom_pcie_init_2_4_0,
+       .deinit = qcom_pcie_deinit_2_4_0,
+       .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
 };
 
-static const struct qcom_pcie_ops ops_v3 = {
-       .get_resources = qcom_pcie_get_resources_v3,
-       .init = qcom_pcie_init_v3,
-       .deinit = qcom_pcie_deinit_v3,
-       .ltssm_enable = qcom_pcie_v2_ltssm_enable,
+static const struct dw_pcie_ops dw_pcie_ops = {
+       .link_up = qcom_pcie_link_up,
 };
 
 static int qcom_pcie_probe(struct platform_device *pdev)
@@ -1089,11 +1093,11 @@ static int qcom_pcie_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id qcom_pcie_match[] = {
-       { .compatible = "qcom,pcie-ipq8064", .data = &ops_v0 },
-       { .compatible = "qcom,pcie-apq8064", .data = &ops_v0 },
-       { .compatible = "qcom,pcie-apq8084", .data = &ops_v1 },
-       { .compatible = "qcom,pcie-msm8996", .data = &ops_v2 },
-       { .compatible = "qcom,pcie-ipq4019", .data = &ops_v3 },
+       { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 },
+       { .compatible = "qcom,pcie-apq8064", .data = &ops_2_1_0 },
+       { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 },
+       { .compatible = "qcom,pcie-msm8996", .data = &ops_2_3_2 },
+       { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 },
        { }
 };