From f115051f44cf887631cb68d242a84fb6daabd804 Mon Sep 17 00:00:00 2001 From: "mason.huo" Date: Fri, 29 Jul 2022 15:17:55 +0800 Subject: [PATCH] regulator: axp15060: Change the cpu_vdd_0p9 to cpu_vdd Rename the cpu_vdd_0p9 regulator to cpu_vdd, since the regulator may changed per cpu frequency. Signed-off-by: mason.huo --- drivers/cpufreq/starfive-cpufreq.c | 2 +- drivers/regulator/axp15060-regulator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/starfive-cpufreq.c b/drivers/cpufreq/starfive-cpufreq.c index 9338b52..54c2539 100644 --- a/drivers/cpufreq/starfive-cpufreq.c +++ b/drivers/cpufreq/starfive-cpufreq.c @@ -113,7 +113,7 @@ static int starfive_cpu_dvfs_info_init(struct platform_device *pdev, int ret; static int retry = 3; - info->vddcpu = regulator_get_optional(&pdev->dev, "cpu_vdd_0p9"); + info->vddcpu = regulator_get_optional(&pdev->dev, "cpu_vdd"); if (IS_ERR(info->vddcpu)) { if (PTR_ERR(info->vddcpu) == -EPROBE_DEFER) dev_warn(&pdev->dev, "The cpu regulator is not ready, retry.\n"); diff --git a/drivers/regulator/axp15060-regulator.c b/drivers/regulator/axp15060-regulator.c index e5d2b4c..fa3abee 100644 --- a/drivers/regulator/axp15060-regulator.c +++ b/drivers/regulator/axp15060-regulator.c @@ -282,7 +282,7 @@ static const struct regulator_desc axp15060_regulators[] = { AXP15060_VOL_CTRL_ALDO_5, AXP15060_ALDO5_V_OUT_MASK, AXP15060_ON_OFF_CTRL_2, AXP15060_PWR_OUT_ALDO5_MASK), - AXP15060_DESC_RANGES(DCDC2, "cpu_vdd_0p9", + AXP15060_DESC_RANGES(DCDC2, "cpu_vdd", axp15060_dcdc2_ranges, AXP15060_DCDC2_NUM_VOLTAGES, AXP15060_VOL_CTRL_DCDC_2, AXP15060_DCDC2_V_OUT_MASK, AXP15060_ON_OFF_CTRL_1, AXP15060_PWR_OUT_DCDC2_MASK), @@ -293,7 +293,7 @@ static struct of_regulator_match axp15060_matches[] = { { .name = "hdmi_1p8", }, { .name = "sdio_vdd", }, { .name = "hdmi_0p9", }, - { .name = "cpu_vdd_0p9", }, + { .name = "cpu_vdd", }, }; static int axp15060_i2c_probe(struct i2c_client *i2c) -- 2.7.4