From patchwork Mon Jun 12 05:39:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 691751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65898C7EE37 for ; Mon, 12 Jun 2023 05:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235988AbjFLFkG (ORCPT ); Mon, 12 Jun 2023 01:40:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235542AbjFLFjr (ORCPT ); Mon, 12 Jun 2023 01:39:47 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1DFF10E3 for ; Sun, 11 Jun 2023 22:39:36 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f649db9b25so4445476e87.0 for ; Sun, 11 Jun 2023 22:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686548374; x=1689140374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I6BmIz26haO/gRx19tTS+BciZJfoAnK1MSrY6sI/V8k=; b=QFY8ZBjlIVAsQYNCRm8MpmPXZt8qZvcVP/Xp6qxReozaztaxZg7fJnMQn+sWoPexl9 lVyLgMPyldymmgl5IlxcX5fEHMqF8xfjpOspd3OxolLhopC4daJ8H4miHbq+JmYAgy26 Ft8WoX1Bu4u9ifYn76NX0k1cgmaYLdytTikYLnGQPtWjDAxj33uhwM/J2C45qIKOE1P5 wVS11E+YUo0ON7OFTblPyQtBmdt5+QnrSvFe3BvbuqL/cw5ihzpSh+sLeV5p/M7Ibbul 1LWl9pUdciY1p2jRT9xsYdagj9EaWBFFCKh4fnwKXB+1sjS4a4Yf34JcK5KTHJ+eSJMX 0IkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686548374; x=1689140374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I6BmIz26haO/gRx19tTS+BciZJfoAnK1MSrY6sI/V8k=; b=ZD7NVIXt1bo6vzjmp93DXaQwWzCGtX7r317PjxgD78ILaVtWF0DGoIlk0ZAD9ppqtp EopE2pVlHwaO+MMIh7ed1h3VPQXSf5lyGVsVOUk1U5zX7jqGbro7k15wZQeOR+R0Pjw4 EmnR9Y85DHKEQ+It5XxowiLig1ITPLVWfGkwxGuiy8g2a96fFAtkYqI57cywItM66QoD +Clja+My/VxSoTLOd655CIJEEZ9f49CWFAfUK++0cyAgGxuG3Qsvvkx4IfapE+xNBZVb TEKuAQwsC/h+vDFuAXBxMJ7kUgf62Eo06FyUbEQPFilSu5TkZBZQo09Lx0HX4nsqEYxm hPyw== X-Gm-Message-State: AC+VfDzSkO7Bh9KQdclyBtqU+HWIljPkVN6Tdg9KvbTHXTTOa3GBQubJ o3BBRvkCEmy3LCPAvx/zrU+Llg== X-Google-Smtp-Source: ACHHUZ7+Jem4hQArYg/4ZZ2o2xuhyXDoB47oVaMbUTualpRO95YO9Rlm7N0YUi+NM71qo45fUj/ibQ== X-Received: by 2002:a19:7101:0:b0:4f3:b61a:a94b with SMTP id m1-20020a197101000000b004f3b61aa94bmr3213076lfc.53.1686548374716; Sun, 11 Jun 2023 22:39:34 -0700 (PDT) Received: from eriador.lan (dzdqv0yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::8a5]) by smtp.gmail.com with ESMTPSA id n6-20020a195506000000b004f38260f196sm1324125lfe.218.2023.06.11.22.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 22:39:34 -0700 (PDT) From: Dmitry Baryshkov To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross , Bjorn Andersson , Konrad Dybcio , Ilia Lin , Viresh Kumar , Nishanth Menon , Stephen Boyd , Michael Turquette , "Rafael J. Wysocki" Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, Christian Marangi Subject: [PATCH 11/18] cpufreq: qcom-nvmem: provide separate configuration data for apq8064 Date: Mon, 12 Jun 2023 08:39:15 +0300 Message-Id: <20230612053922.3284394-12-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612053922.3284394-1-dmitry.baryshkov@linaro.org> References: <20230612053922.3284394-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- drivers/cpufreq/qcom-cpufreq-nvmem.c | 44 ++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index fc446acfda22..e5fede594399 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -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 }, {},