From 754fc3ef69c7186d027e629a11a9428d0a5cf0a6 Mon Sep 17 00:00:00 2001 From: Xubin Bai Date: Fri, 29 Jul 2022 14:20:08 -0700 Subject: [PATCH] clk: qcom: pineapple: change the max vdd_level from Turbo_L1 to Turbo Some voltage rails can support TURBO_L1 as theri max voltage level, like VDD_CX and so on. Some voltage rails can only support TURBO as their max voltage level, like VDD_MM and so on. But since we don't need Turbo_L1 for any of our CCs, then reduce it for all of them. Change-Id: I92ed5f2aeddde9ba526c91db75278c9d124c7463 Signed-off-by: Xubin Bai --- drivers/clk/qcom/camcc-pineapple.c | 2 +- drivers/clk/qcom/dispcc-pineapple.c | 2 +- drivers/clk/qcom/gcc-pineapple.c | 2 +- drivers/clk/qcom/gpucc-pineapple.c | 6 +++--- drivers/clk/qcom/videocc-pineapple.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/qcom/camcc-pineapple.c b/drivers/clk/qcom/camcc-pineapple.c index 0e501aa6911f..7227e06f39f2 100644 --- a/drivers/clk/qcom/camcc-pineapple.c +++ b/drivers/clk/qcom/camcc-pineapple.c @@ -28,7 +28,7 @@ static DEFINE_VDD_REGULATORS(vdd_mm, VDD_NOMINAL + 1, 1, vdd_corner); static DEFINE_VDD_REGULATORS(vdd_mxa, VDD_LOW + 1, 1, vdd_corner); -static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH_L1 + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH + 1, 1, vdd_corner); static struct clk_vdd_class *cam_cc_pineapple_regulators[] = { &vdd_mm, diff --git a/drivers/clk/qcom/dispcc-pineapple.c b/drivers/clk/qcom/dispcc-pineapple.c index e35811aa5fb0..3151ee0cd75d 100644 --- a/drivers/clk/qcom/dispcc-pineapple.c +++ b/drivers/clk/qcom/dispcc-pineapple.c @@ -28,7 +28,7 @@ #define DISP_CC_MISC_CMD 0xF000 -static DEFINE_VDD_REGULATORS(vdd_mm, VDD_HIGH_L1 + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_mm, VDD_HIGH + 1, 1, vdd_corner); static DEFINE_VDD_REGULATORS(vdd_mxa, VDD_NOMINAL + 1, 1, vdd_corner); static struct clk_vdd_class *disp_cc_pineapple_regulators[] = { diff --git a/drivers/clk/qcom/gcc-pineapple.c b/drivers/clk/qcom/gcc-pineapple.c index 790df5462eb1..4755187ea0bf 100644 --- a/drivers/clk/qcom/gcc-pineapple.c +++ b/drivers/clk/qcom/gcc-pineapple.c @@ -25,7 +25,7 @@ #include "reset.h" #include "vdd-level.h" -static DEFINE_VDD_REGULATORS(vdd_cx, VDD_HIGH_L1 + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_cx, VDD_HIGH + 1, 1, vdd_corner); static DEFINE_VDD_REGULATORS(vdd_mxa, VDD_HIGH + 1, 1, vdd_corner); static struct clk_vdd_class *gcc_pineapple_regulators[] = { diff --git a/drivers/clk/qcom/gpucc-pineapple.c b/drivers/clk/qcom/gpucc-pineapple.c index 91ad6c917015..eaf407862716 100644 --- a/drivers/clk/qcom/gpucc-pineapple.c +++ b/drivers/clk/qcom/gpucc-pineapple.c @@ -25,9 +25,9 @@ #include "reset.h" #include "vdd-level.h" -static DEFINE_VDD_REGULATORS(vdd_cx, VDD_HIGH_L1 + 1, 1, vdd_corner); -static DEFINE_VDD_REGULATORS(vdd_mx, VDD_HIGH_L1 + 1, 1, vdd_corner); -static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH_L1 + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_cx, VDD_HIGH + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_mx, VDD_HIGH + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH + 1, 1, vdd_corner); static struct clk_vdd_class *gpu_cc_pineapple_regulators[] = { &vdd_cx, diff --git a/drivers/clk/qcom/videocc-pineapple.c b/drivers/clk/qcom/videocc-pineapple.c index 9a50131ec1b7..8065b8e23062 100644 --- a/drivers/clk/qcom/videocc-pineapple.c +++ b/drivers/clk/qcom/videocc-pineapple.c @@ -27,7 +27,7 @@ #include "vdd-level.h" static DEFINE_VDD_REGULATORS(vdd_mm, VDD_HIGH + 1, 1, vdd_corner); -static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH_L1 + 1, 1, vdd_corner); +static DEFINE_VDD_REGULATORS(vdd_mxc, VDD_HIGH + 1, 1, vdd_corner); static struct clk_vdd_class *video_cc_pineapple_regulators[] = { &vdd_mm,