mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-29 15:44:04 +00:00
86bc525d00
Most of the CPUFreq NVMEM patches have been upstreamed in an improved way. IPQ8074 support itself is being reviewed upstream currently. Upstreamed patches have been moved to generic backports so that ipq806x can use them as well, so lets just use the latest version of IPQ8074 support that is being reviewed upstream. Runtime tested on Qnap 301W (IPQ8072A) and Xiaomi AX3600 (IPQ8071A). Signed-off-by: Robert Marko <robimarko@gmail.com>
109 lines
3.3 KiB
Diff
109 lines
3.3 KiB
Diff
From 11592aa862e67f4477dee7e94d5c8244d893de1b Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sat, 31 Dec 2022 13:03:41 +0100
|
|
Subject: [PATCH] cpufreq: qcom-nvmem: add support for IPQ8074
|
|
|
|
IPQ8074 comes in 2 families:
|
|
* IPQ8070A/IPQ8071A (Acorn) 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 <robimarko@gmail.com>
|
|
---
|
|
Changes in v2:
|
|
* Print an error if SMEM ID is not part of the IPQ8074 family
|
|
and restrict the speed to Acorn variant (1.4GHz)
|
|
---
|
|
drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
|
|
drivers/cpufreq/qcom-cpufreq-nvmem.c | 43 ++++++++++++++++++++++++++++
|
|
2 files changed, 44 insertions(+)
|
|
|
|
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
@@ -164,6 +164,7 @@ static const struct of_device_id blockli
|
|
{ .compatible = "ti,omap3", },
|
|
|
|
{ .compatible = "qcom,ipq8064", },
|
|
+ { .compatible = "qcom,ipq8074", },
|
|
{ .compatible = "qcom,apq8064", },
|
|
{ .compatible = "qcom,msm8974", },
|
|
{ .compatible = "qcom,msm8960", },
|
|
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
@@ -31,6 +31,9 @@
|
|
|
|
#include <dt-bindings/arm/qcom,ids.h>
|
|
|
|
+#define IPQ8074_HAWKEYE_VERSION BIT(0)
|
|
+#define IPQ8074_ACORN_VERSION BIT(1)
|
|
+
|
|
struct qcom_cpufreq_drv;
|
|
|
|
struct qcom_cpufreq_match_data {
|
|
@@ -204,6 +207,41 @@ len_error:
|
|
return ret;
|
|
}
|
|
|
|
+static int qcom_cpufreq_ipq8074_name_version(struct device *cpu_dev,
|
|
+ struct nvmem_cell *speedbin_nvmem,
|
|
+ char **pvs_name,
|
|
+ struct qcom_cpufreq_drv *drv)
|
|
+{
|
|
+ u32 msm_id;
|
|
+ int ret;
|
|
+ *pvs_name = NULL;
|
|
+
|
|
+ ret = qcom_smem_get_soc_id(&msm_id);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ switch (msm_id) {
|
|
+ case QCOM_ID_IPQ8070A:
|
|
+ case QCOM_ID_IPQ8071A:
|
|
+ drv->versions = IPQ8074_ACORN_VERSION;
|
|
+ break;
|
|
+ case QCOM_ID_IPQ8072A:
|
|
+ case QCOM_ID_IPQ8074A:
|
|
+ case QCOM_ID_IPQ8076A:
|
|
+ case QCOM_ID_IPQ8078A:
|
|
+ drv->versions = IPQ8074_HAWKEYE_VERSION;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(cpu_dev,
|
|
+ "SoC ID %u is not part of IPQ8074 family, limiting to 1.4GHz!\n",
|
|
+ msm_id);
|
|
+ drv->versions = IPQ8074_ACORN_VERSION;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static const struct qcom_cpufreq_match_data match_data_kryo = {
|
|
.get_version = qcom_cpufreq_kryo_name_version,
|
|
};
|
|
@@ -218,6 +256,10 @@ static const struct qcom_cpufreq_match_d
|
|
.genpd_names = qcs404_genpd_names,
|
|
};
|
|
|
|
+static const struct qcom_cpufreq_match_data match_data_ipq8074 = {
|
|
+ .get_version = qcom_cpufreq_ipq8074_name_version,
|
|
+};
|
|
+
|
|
static int qcom_cpufreq_probe(struct platform_device *pdev)
|
|
{
|
|
struct qcom_cpufreq_drv *drv;
|
|
@@ -363,6 +405,7 @@ static const struct of_device_id qcom_cp
|
|
{ .compatible = "qcom,msm8996", .data = &match_data_kryo },
|
|
{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
|
|
{ .compatible = "qcom,ipq8064", .data = &match_data_krait },
|
|
+ { .compatible = "qcom,ipq8074", .data = &match_data_ipq8074 },
|
|
{ .compatible = "qcom,apq8064", .data = &match_data_krait },
|
|
{ .compatible = "qcom,msm8974", .data = &match_data_krait },
|
|
{ .compatible = "qcom,msm8960", .data = &match_data_krait },
|