target/linux/generic/backport-6.1/830-04-v6.5-cpufreq-qcom-nvmem-use-SoC-ID-s-from-bindings.patch

   1 From 2b8634d1468ff498cc91b6adf993c27ae6fa079d Mon Sep 17 00:00:00 2001
   2 From: Robert Marko <robimarko@gmail.com>
   3 Date: Fri, 26 May 2023 22:48:01 +0200
   4 Subject: [PATCH] cpufreq: qcom-nvmem: use SoC ID-s from bindings
   5
   6 SMEM SoC ID-s are now stored in DT bindings so lets use those instead of
   7 defining them in the driver again.
   8
   9 Signed-off-by: Robert Marko <robimarko@gmail.com>
  10 Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
  11 Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  12 Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
  13 Signed-off-by: Bjorn Andersson <andersson@kernel.org>
  14 Link: https://lore.kernel.org/r/20230526204802.3081168-4-robimarko@gmail.com
  15 ---
  16  drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++----------
  17  1 file changed, 5 insertions(+), 10 deletions(-)
  18
  19 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
  20 +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
  21 @@ -30,12 +30,7 @@
  22
  23  #define MSM_ID_SMEM    137
  24
  25 -enum _msm_id {
  26 -       MSM8996V3 = 0xF6ul,
  27 -       APQ8096V3 = 0x123ul,
  28 -       MSM8996SG = 0x131ul,
  29 -       APQ8096SG = 0x138ul,
  30 -};
  31 +#include <dt-bindings/arm/qcom,ids.h>
  32
  33  enum _msm8996_version {
  34         MSM8996_V3,
  35 @@ -153,12 +148,12 @@ static enum _msm8996_version qcom_cpufre
  36         msm_id++;
  37
  38         switch ((enum _msm_id)*msm_id) {
  39 -       case MSM8996V3:
  40 -       case APQ8096V3:
  41 +       case QCOM_ID_MSM8996:
  42 +       case QCOM_ID_APQ8096:
  43                 version = MSM8996_V3;
  44                 break;
  45 -       case MSM8996SG:
  46 -       case APQ8096SG:
  47 +       case QCOM_ID_MSM8996SG:
  48 +       case QCOM_ID_APQ8096SG:
  49                 version = MSM8996_SG;
  50                 break;
  51         default: