mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data

The msm8994 type of apcs_data is defined multiple times with different
SoC name encoded.  Consolidate them on msm8994 and remove the data
duplication.

Signed-off-by: Shawn Guo <shawn.guo@linaro.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 71571eeef1200a622c0917f8166a86318c882d61..12d9bab434283d3cbe775be6ee7f696b1b5c3d7c 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data ipq6018_apcs_data = {
        .offset = 8, .clk_name = "qcom,apss-ipq6018-clk"
 };
 
-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"
 };
@@ -49,18 +45,6 @@ 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 sdm660_apcs_data = {
-       .offset = 8, .clk_name = NULL
-};
-
-static const struct qcom_apcs_ipc_data sm6125_apcs_data = {
-       .offset = 8, .clk_name = NULL
-};
-
 static const struct qcom_apcs_ipc_data apps_shared_apcs_data = {
        .offset = 12, .clk_name = NULL
 };
@@ -158,21 +142,21 @@ 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,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
-       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq8074_apcs_data },
+       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
-       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8998_apcs_data },
+       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
        { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
-       { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
+       { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
-       { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &sm6125_apcs_data },
+       { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
-       { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
+       { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
        {}
 };