Skip to content

Commit 0b9cd94

Browse files
robimarkovireshk
authored andcommitted
cpufreq: qcom-nvmem: add support for IPQ8074
IPQ8074 comes in 3 families: * IPQ8070A/IPQ8071A (Acorn) up to 1.4GHz * IPQ8172/IPQ8173/IPQ8174 (Oak) up to 1.4GHz * IPQ8072A/IPQ8074A/IPQ8076A/IPQ8078A (Hawkeye) up to 2.2GHz So, in order to be able to share one OPP table lets add support for IPQ8074 family based of SMEM SoC ID-s as speedbin fuse is always 0 on IPQ8074. IPQ8074 compatible is blacklisted from DT platdev as the cpufreq device will get created by NVMEM CPUFreq driver. Signed-off-by: Robert Marko <[email protected]> Acked-by: Konrad Dybcio <[email protected]> [ Viresh: Fixed rebase conflict. ] Signed-off-by: Viresh Kumar <[email protected]>
1 parent 477348d commit 0b9cd94

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

drivers/cpufreq/cpufreq-dt-platdev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ static const struct of_device_id blocklist[] __initconst = {
182182

183183
{ .compatible = "qcom,ipq6018", },
184184
{ .compatible = "qcom,ipq8064", },
185+
{ .compatible = "qcom,ipq8074", },
185186
{ .compatible = "qcom,apq8064", },
186187
{ .compatible = "qcom,msm8974", },
187188
{ .compatible = "qcom,msm8960", },

drivers/cpufreq/qcom-cpufreq-nvmem.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ enum ipq806x_versions {
3838

3939
#define IPQ6000_VERSION BIT(2)
4040

41+
enum ipq8074_versions {
42+
IPQ8074_HAWKEYE_VERSION = 0,
43+
IPQ8074_ACORN_VERSION,
44+
};
45+
4146
struct qcom_cpufreq_drv;
4247

4348
struct qcom_cpufreq_match_data {
@@ -338,6 +343,44 @@ static int qcom_cpufreq_ipq6018_name_version(struct device *cpu_dev,
338343
return 0;
339344
}
340345

346+
static int qcom_cpufreq_ipq8074_name_version(struct device *cpu_dev,
347+
struct nvmem_cell *speedbin_nvmem,
348+
char **pvs_name,
349+
struct qcom_cpufreq_drv *drv)
350+
{
351+
u32 msm_id;
352+
int ret;
353+
*pvs_name = NULL;
354+
355+
ret = qcom_smem_get_soc_id(&msm_id);
356+
if (ret)
357+
return ret;
358+
359+
switch (msm_id) {
360+
case QCOM_ID_IPQ8070A:
361+
case QCOM_ID_IPQ8071A:
362+
case QCOM_ID_IPQ8172:
363+
case QCOM_ID_IPQ8173:
364+
case QCOM_ID_IPQ8174:
365+
drv->versions = BIT(IPQ8074_ACORN_VERSION);
366+
break;
367+
case QCOM_ID_IPQ8072A:
368+
case QCOM_ID_IPQ8074A:
369+
case QCOM_ID_IPQ8076A:
370+
case QCOM_ID_IPQ8078A:
371+
drv->versions = BIT(IPQ8074_HAWKEYE_VERSION);
372+
break;
373+
default:
374+
dev_err(cpu_dev,
375+
"SoC ID %u is not part of IPQ8074 family, limiting to 1.4GHz!\n",
376+
msm_id);
377+
drv->versions = BIT(IPQ8074_ACORN_VERSION);
378+
break;
379+
}
380+
381+
return 0;
382+
}
383+
341384
static const char *generic_genpd_names[] = { "perf", NULL };
342385

343386
static const struct qcom_cpufreq_match_data match_data_kryo = {
@@ -367,6 +410,10 @@ static const struct qcom_cpufreq_match_data match_data_ipq8064 = {
367410
.get_version = qcom_cpufreq_ipq8064_name_version,
368411
};
369412

413+
static const struct qcom_cpufreq_match_data match_data_ipq8074 = {
414+
.get_version = qcom_cpufreq_ipq8074_name_version,
415+
};
416+
370417
static int qcom_cpufreq_probe(struct platform_device *pdev)
371418
{
372419
struct qcom_cpufreq_drv *drv;
@@ -496,6 +543,7 @@ static const struct of_device_id qcom_cpufreq_match_list[] __initconst = {
496543
{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
497544
{ .compatible = "qcom,ipq6018", .data = &match_data_ipq6018 },
498545
{ .compatible = "qcom,ipq8064", .data = &match_data_ipq8064 },
546+
{ .compatible = "qcom,ipq8074", .data = &match_data_ipq8074 },
499547
{ .compatible = "qcom,apq8064", .data = &match_data_krait },
500548
{ .compatible = "qcom,msm8974", .data = &match_data_krait },
501549
{ .compatible = "qcom,msm8960", .data = &match_data_krait },

0 commit comments

Comments
 (0)