830-04-v6.5-cpufreq-qcom-nvmem-use-SoC-ID-s-from-bindings.patch 1.4 KB

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