git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

   1 From a6e1d17fbfd41113bf47345e65953873e717ca63 Mon Sep 17 00:00:00 2001
   2 From: Shawn Guo <shawn.guo@linaro.org>
   3 Date: Tue, 14 Sep 2021 09:40:48 +0800
   4 Subject: [PATCH] mailbox: qcom-apcs-ipc: Consolidate msm8994 type apcs_data
   5
   6 The msm8994 type of apcs_data is defined multiple times with different
   7 SoC name encoded.  Consolidate them on msm8994 and remove the data
   8 duplication.
   9
  10 Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  11 Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
  12 ---
  13  drivers/mailbox/qcom-apcs-ipc-mailbox.c | 26 +++++--------------------
  14  1 file changed, 5 insertions(+), 21 deletions(-)
  15
  16 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
  17 +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
  18 @@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data i
  19         .offset = 8, .clk_name = "qcom,apss-ipq6018-clk"
  20  };
  21
  22 -static const struct qcom_apcs_ipc_data ipq8074_apcs_data = {
  23 -       .offset = 8, .clk_name = NULL
  24 -};
  25 -
  26  static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
  27         .offset = 8, .clk_name = "qcom-apcs-msm8916-clk"
  28  };
  29 @@ -49,18 +45,6 @@ static const struct qcom_apcs_ipc_data m
  30         .offset = 16, .clk_name = NULL
  31  };
  32
  33 -static const struct qcom_apcs_ipc_data msm8998_apcs_data = {
  34 -       .offset = 8, .clk_name = NULL
  35 -};
  36 -
  37 -static const struct qcom_apcs_ipc_data sdm660_apcs_data = {
  38 -       .offset = 8, .clk_name = NULL
  39 -};
  40 -
  41 -static const struct qcom_apcs_ipc_data sm6125_apcs_data = {
  42 -       .offset = 8, .clk_name = NULL
  43 -};
  44 -
  45  static const struct qcom_apcs_ipc_data apps_shared_apcs_data = {
  46         .offset = 12, .clk_name = NULL
  47  };
  48 @@ -160,21 +144,21 @@ static int qcom_apcs_ipc_remove(struct p
  49  /* .data is the offset of the ipc register within the global block */
  50  static const struct of_device_id qcom_apcs_ipc_of_match[] = {
  51         { .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
  52 -       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq8074_apcs_data },
  53 +       { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &msm8994_apcs_data },
  54         { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
  55         { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
  56         { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
  57         { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data },
  58         { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
  59 -       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8998_apcs_data },
  60 +       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
  61         { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
  62         { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
  63         { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
  64 -       { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &sdm660_apcs_data },
  65 +       { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
  66         { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
  67 -       { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &sm6125_apcs_data },
  68 +       { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
  69         { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
  70 -       { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &sdm660_apcs_data },
  71 +       { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
  72         { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
  73         {}
  74  };