mailbox: qcom: Add clock driver name in apcs mailbox driver data

Some apcs mailbox devices supports a clock driver, the compatible
strings of devices supporting clock driver along with the clock driver
name are maintained in a separate structure within the mailbox driver.
And the clock driver is added based on device match.

With increase in number of devices supporting the clock feature move the
clock driver name inside the driver data. so that we can use a single
API to get the register offset of mailbox driver and clock driver name
together, and the clock driver will be added based on the driver data.

Signed-off-by: Sivaprakash Murugesan <sivaprak@codeaurora.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index eeebafd546e56e47f0dec5a2679359c7702fbc20..49eebb5b87bc093afce3db3392d3b269cb475b25 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -24,6 +24,31 @@ struct qcom_apcs_ipc {
        struct platform_device *clk;
 };
 
+struct qcom_apcs_ipc_data {
+       int offset;
+       char *clk_name;
+};
+
+static const struct qcom_apcs_ipc_data ipq8074_apcs_data = {
+       .offset = 8, .clk_name = NULL
+};
+
+static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
+       .offset = 8, .clk_name = "qcom-apcs-msm8916-clk"
+};
+
+static const struct qcom_apcs_ipc_data msm8996_apcs_data = {
+       .offset = 16, .clk_name = NULL
+};
+
+static const struct qcom_apcs_ipc_data msm8998_apcs_data = {
+       .offset = 8, .clk_name = NULL
+};
+
+static const struct qcom_apcs_ipc_data apps_shared_apcs_data = {
+       .offset = 12, .clk_name = NULL
+};
+
 static const struct regmap_config apcs_regmap_config = {
        .reg_bits = 32,
        .reg_stride = 4,
@@ -48,17 +73,12 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = {
 static int qcom_apcs_ipc_probe(struct platform_device *pdev)
 {
        struct qcom_apcs_ipc *apcs;
+       const struct qcom_apcs_ipc_data *apcs_data;
        struct regmap *regmap;
        struct resource *res;
-       unsigned long offset;
        void __iomem *base;
        unsigned long i;
        int ret;
-       const struct of_device_id apcs_clk_match_table[] = {
-               { .compatible = "qcom,msm8916-apcs-kpss-global", },
-               { .compatible = "qcom,qcs404-apcs-apps-global", },
-               {}
-       };
 
        apcs = devm_kzalloc(&pdev->dev, sizeof(*apcs), GFP_KERNEL);
        if (!apcs)
@@ -73,10 +93,10 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       offset = (unsigned long)of_device_get_match_data(&pdev->dev);
+       apcs_data = of_device_get_match_data(&pdev->dev);
 
        apcs->regmap = regmap;
-       apcs->offset = offset;
+       apcs->offset = apcs_data->offset;
 
        /* Initialize channel identifiers */
        for (i = 0; i < ARRAY_SIZE(apcs->mbox_chans); i++)
@@ -93,9 +113,9 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       if (of_match_device(apcs_clk_match_table, &pdev->dev)) {
+       if (apcs_data->clk_name) {
                apcs->clk = platform_device_register_data(&pdev->dev,
-                                                         "qcom-apcs-msm8916-clk",
+                                                         apcs_data->clk_name,
                                                          PLATFORM_DEVID_NONE,
                                                          NULL, 0);
                if (IS_ERR(apcs->clk))
@@ -119,14 +139,14 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
 
 /* .data is the offset of the ipc register within the global block */
 static const struct of_device_id qcom_apcs_ipc_of_match[] = {
-       { .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 },
-       { .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 },
-       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = (void *)8 },
-       { .compatible = "qcom,qcs404-apcs-apps-global", .data = (void *)8 },
-       { .compatible = "qcom,sc7180-apss-shared", .data = (void *)12 },
-       { .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 },
-       { .compatible = "qcom,sm8150-apss-shared", .data = (void *)12 },
-       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = (void *)8 },
+       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq8074_apcs_data },
+       { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
+       { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
+       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8998_apcs_data },
+       { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
+       { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
+       { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
+       { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);