| Message ID | 20230121112947.53433-3-robimarko@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] soc: qcom: socinfo: move SMEM item struct and defines to a header | expand |
On 21.01.2023 12:29, Robert Marko wrote: > SMEM SoC ID-s are now stored in DT bindings so lets use those instead of > defining them in the driver again. > > Signed-off-by: Robert Marko <robimarko@gmail.com> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c > index c0a7841a56c1..da55d2e1925a 100644 > --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c > +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c > @@ -30,12 +30,7 @@ > #include <linux/soc/qcom/smem.h> > #include <linux/soc/qcom/socinfo.h> > > -enum _msm_id { > - MSM8996V3 = 0xF6ul, > - APQ8096V3 = 0x123ul, > - MSM8996SG = 0x131ul, > - APQ8096SG = 0x138ul, > -}; > +#include <dt-bindings/arm/qcom,ids.h> > > enum _msm8996_version { > MSM8996_V3, > @@ -150,12 +145,12 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) > return NUM_OF_MSM8996_VERSIONS; > > switch (info->id) { > - case MSM8996V3: > - case APQ8096V3: > + case QCOM_ID_MSM8996: > + case QCOM_ID_APQ8096: > version = MSM8996_V3; > break; > - case MSM8996SG: > - case APQ8096SG: > + case QCOM_ID_MSM8996SG: > + case QCOM_ID_APQ8096SG: > version = MSM8996_SG; > break; > default:
diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index c0a7841a56c1..da55d2e1925a 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -30,12 +30,7 @@ #include <linux/soc/qcom/smem.h> #include <linux/soc/qcom/socinfo.h> -enum _msm_id { - MSM8996V3 = 0xF6ul, - APQ8096V3 = 0x123ul, - MSM8996SG = 0x131ul, - APQ8096SG = 0x138ul, -}; +#include <dt-bindings/arm/qcom,ids.h> enum _msm8996_version { MSM8996_V3, @@ -150,12 +145,12 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) return NUM_OF_MSM8996_VERSIONS; switch (info->id) { - case MSM8996V3: - case APQ8096V3: + case QCOM_ID_MSM8996: + case QCOM_ID_APQ8096: version = MSM8996_V3; break; - case MSM8996SG: - case APQ8096SG: + case QCOM_ID_MSM8996SG: + case QCOM_ID_APQ8096SG: version = MSM8996_SG; break; default:
SMEM SoC ID-s are now stored in DT bindings so lets use those instead of defining them in the driver again. Signed-off-by: Robert Marko <robimarko@gmail.com> --- drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)