@@ -206,6 +206,34 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
return ret;
}
+static int qcom_cpufreq_apq8064_name_version(struct device *cpu_dev,
+ struct nvmem_cell *speedbin_nvmem,
+ char **pvs_name,
+ struct qcom_cpufreq_drv *drv)
+{
+ int speed = 0, pvs = 0;
+ u8 *speedbin;
+ size_t len;
+ int ret = 0;
+
+ speedbin = nvmem_cell_read(speedbin_nvmem, &len);
+ if (IS_ERR(speedbin))
+ return PTR_ERR(speedbin);
+
+ if (len != 4)
+ return -EINVAL;
+
+ get_krait_bin_format_a(cpu_dev, &speed, &pvs, speedbin);
+
+ snprintf(*pvs_name, sizeof("speedXX-pvsXX"), "speed%d-pvs%d",
+ speed, pvs);
+
+ drv->versions = (1 << speed);
+
+ kfree(speedbin);
+ return ret;
+}
+
static const struct qcom_cpufreq_match_data match_data_kryo = {
.get_version = qcom_cpufreq_kryo_name_version,
};
@@ -220,7 +248,19 @@ static const struct qcom_cpufreq_match_data match_data_qcs404 = {
.genpd_names = qcs404_genpd_names,
};
-#define NUM_SUPPLIES 2
+static const char * apq8064_regulator_names[] = {
+ "vdd-mem",
+ "vdd-dig",
+ "vdd-core",
+ NULL
+};
+
+static const struct qcom_cpufreq_match_data match_data_apq8064 = {
+ .get_version = qcom_cpufreq_apq8064_name_version,
+ .regulator_names = apq8064_regulator_names,
+};
+
+#define NUM_SUPPLIES 3
static int qcom_cpufreq_config_regulators(struct device *dev,
struct dev_pm_opp *old_opp,
struct dev_pm_opp *new_opp,
@@ -477,7 +517,7 @@ static const struct of_device_id qcom_cpufreq_match_list[] __initconst = {
{ .compatible = "qcom,msm8996", .data = &match_data_kryo },
{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
{ .compatible = "qcom,ipq8064", .data = &match_data_krait },
- { .compatible = "qcom,apq8064", .data = &match_data_krait },
+ { .compatible = "qcom,apq8064", .data = &match_data_apq8064 },
{ .compatible = "qcom,msm8974", .data = &match_data_krait },
{ .compatible = "qcom,msm8960", .data = &match_data_krait },
{},
APQ8064 can scale core and memory voltages according to the frequency needs. Rather than reusing the A/B format multiplexer, use a simple fuse parsing function and configure required regulators. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/cpufreq/qcom-cpufreq-nvmem.c | 44 ++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-)