mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
4108c0c1b6
- Mark patches as upstream - Backport more upstream changes - Handle conflicts and refresh patches Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
114 lines
3.5 KiB
Diff
114 lines
3.5 KiB
Diff
From 0b9cd949136f1b63f7aa9424b6e583a1ab261e36 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Fri, 13 Oct 2023 19:20:02 +0200
|
|
Subject: [PATCH] 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 <robimarko@gmail.com>
|
|
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
[ Viresh: Fixed rebase conflict. ]
|
|
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
---
|
|
drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
|
|
drivers/cpufreq/qcom-cpufreq-nvmem.c | 48 ++++++++++++++++++++++++++++
|
|
2 files changed, 49 insertions(+)
|
|
|
|
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
@@ -165,6 +165,7 @@ static const struct of_device_id blockli
|
|
|
|
{ .compatible = "qcom,ipq6018", },
|
|
{ .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
|
|
@@ -33,6 +33,11 @@
|
|
|
|
#define IPQ6000_VERSION BIT(2)
|
|
|
|
+enum ipq8074_versions {
|
|
+ IPQ8074_HAWKEYE_VERSION = 0,
|
|
+ IPQ8074_ACORN_VERSION,
|
|
+};
|
|
+
|
|
struct qcom_cpufreq_drv;
|
|
|
|
struct qcom_cpufreq_match_data {
|
|
@@ -257,6 +262,44 @@ static int qcom_cpufreq_ipq6018_name_ver
|
|
return 0;
|
|
}
|
|
|
|
+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:
|
|
+ case QCOM_ID_IPQ8172:
|
|
+ case QCOM_ID_IPQ8173:
|
|
+ case QCOM_ID_IPQ8174:
|
|
+ drv->versions = BIT(IPQ8074_ACORN_VERSION);
|
|
+ break;
|
|
+ case QCOM_ID_IPQ8072A:
|
|
+ case QCOM_ID_IPQ8074A:
|
|
+ case QCOM_ID_IPQ8076A:
|
|
+ case QCOM_ID_IPQ8078A:
|
|
+ drv->versions = BIT(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 = BIT(IPQ8074_ACORN_VERSION);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static const struct qcom_cpufreq_match_data match_data_kryo = {
|
|
.get_version = qcom_cpufreq_kryo_name_version,
|
|
};
|
|
@@ -275,6 +318,10 @@ static const struct qcom_cpufreq_match_d
|
|
.get_version = qcom_cpufreq_ipq6018_name_version,
|
|
};
|
|
|
|
+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;
|
|
@@ -421,6 +468,7 @@ static const struct of_device_id qcom_cp
|
|
{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
|
|
{ .compatible = "qcom,ipq6018", .data = &match_data_ipq6018 },
|
|
{ .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 },
|