From 820cf1364c733396d7166f1479ea03966364bb9b Mon Sep 17 00:00:00 2001 From: Richard Raya Date: Sun, 15 Dec 2024 10:08:09 -0300 Subject: [PATCH] Revert "gpucc/dts: sdmmagpie: Add 140MHz GPU frequency step" This reverts commit 79cea8a7a170cbfd4cc109dcb3a23a09ac42179c. Change-Id: Ibc2851d563244664ee1f8532426bd691a0687f73 Signed-off-by: Richard Raya --- arch/arm64/boot/dts/qcom/sdmmagpie-gpu.dtsi | 13 ++----------- drivers/clk/qcom/gpucc-sdmmagpie.c | 4 ---- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdmmagpie-gpu.dtsi b/arch/arm64/boot/dts/qcom/sdmmagpie-gpu.dtsi index 6f1c2e0f1083..36effe24ac0c 100644 --- a/arch/arm64/boot/dts/qcom/sdmmagpie-gpu.dtsi +++ b/arch/arm64/boot/dts/qcom/sdmmagpie-gpu.dtsi @@ -529,7 +529,7 @@ qcom,speed-bin = <167>; - qcom,initial-pwrlevel = <7>; + qcom,initial-pwrlevel = <6>; qcom,ca-target-pwrlevel = <4>; /* TURBO */ @@ -595,18 +595,9 @@ qcom,bus-max = <4>; }; - /* RETENTION SVS */ + /* XO */ qcom,gpu-pwrlevel@7 { reg = <7>; - qcom,gpu-freq = <140000000>; - qcom,bus-freq = <2>; - qcom,bus-min = <1>; - qcom,bus-max = <2>; - }; - - /* XO */ - qcom,gpu-pwrlevel@8 { - reg = <8>; qcom,gpu-freq = <0>; qcom,bus-freq = <0>; qcom,bus-min = <0>; diff --git a/drivers/clk/qcom/gpucc-sdmmagpie.c b/drivers/clk/qcom/gpucc-sdmmagpie.c index e58dc94d37fe..793c93bc003c 100644 --- a/drivers/clk/qcom/gpucc-sdmmagpie.c +++ b/drivers/clk/qcom/gpucc-sdmmagpie.c @@ -39,7 +39,6 @@ enum vdd_gx_levels { VDD_GX_NONE, - VDD_GX_RETENTION, /* RETENTION SVS */ VDD_GX_MIN, /* MIN SVS */ VDD_GX_LOWER, /* SVS2 */ VDD_GX_LOW, /* SVS */ @@ -53,7 +52,6 @@ enum vdd_gx_levels { static int vdd_gx_corner[] = { RPMH_REGULATOR_LEVEL_OFF, /* VDD_GX_NONE */ - RPMH_REGULATOR_LEVEL_RETENTION + 4, /* VDD_GX_RETENTION */ RPMH_REGULATOR_LEVEL_MIN_SVS, /* VDD_GX_MIN */ RPMH_REGULATOR_LEVEL_LOW_SVS, /* VDD_GX_LOWER */ RPMH_REGULATOR_LEVEL_SVS, /* VDD_GX_LOW */ @@ -279,7 +277,6 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { }; static const struct freq_tbl ftbl_gpu_cc_gx_gfx3d_clk_src[] = { - F(140000000, P_CRC_DIV, 1, 0, 0), F(180000000, P_CRC_DIV, 1, 0, 0), F(267000000, P_CRC_DIV, 1, 0, 0), F(355000000, P_CRC_DIV, 1, 0, 0), @@ -311,7 +308,6 @@ static struct clk_rcg2 gpu_cc_gx_gfx3d_clk_src = { .vdd_class = &vdd_gx, .num_rate_max = VDD_GX_NUM, .rate_max = (unsigned long[VDD_GX_NUM]) { - [VDD_GX_RETENTION] = 140000000, [VDD_GX_MIN] = 180000000, [VDD_GX_LOWER] = 267000000, [VDD_GX_LOW] = 355000000,