git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From de5b39d16318f9345f1ba7c1b684ba0c1cb6fdad Mon Sep 17 00:00:00 2001
   2 From: Sam Edwards <cfsworks@gmail.com>
   3 Date: Sun, 8 Jun 2025 11:48:55 -0700
   4 Subject: arm64: dts: rockchip: Remove workaround that prevented Turing RK1 GPU power regulator control
   5
   6 From: Sam Edwards <cfsworks@gmail.com>
   7
   8 commit de5b39d16318f9345f1ba7c1b684ba0c1cb6fdad upstream.
   9
  10 The RK3588 GPU power domain cannot be activated unless the external
  11 power regulator is already on. When GPU support was added to this DT,
  12 we had no way to represent this requirement, so `regulator-always-on`
  13 was added to the `vdd_gpu_s0` regulator in order to ensure stability.
  14 A later patch series (see "Fixes:" commit) resolved this shortcoming,
  15 but that commit left the workaround -- and rendered the comment above
  16 it no longer correct.
  17
  18 Remove the workaround to allow the GPU power regulator to power off, now
  19 that the DT includes the necessary information to power it back on
  20 correctly.
  21
  22 Fixes: f94500eb7328b ("arm64: dts: rockchip: Add GPU power domain regulator dependency for RK3588")
  23 Signed-off-by: Sam Edwards <CFSworks@gmail.com>
  24 Cc: stable@vger.kernel.org
  25 Link: https://lore.kernel.org/r/20250608184855.130206-1-CFSworks@gmail.com
  26 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  27 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  28 ---
  29  arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 11 -----------
  30  1 file changed, 11 deletions(-)
  31
  32 diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
  33 index 60ad272982ad..6daea8961fdd 100644
  34 --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
  35 +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
  36 @@ -398,17 +398,6 @@
  37
  38                 regulators {
  39                         vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
  40 -                               /*
  41 -                                * RK3588's GPU power domain cannot be enabled
  42 -                                * without this regulator active, but it
  43 -                                * doesn't have to be on when the GPU PD is
  44 -                                * disabled.  Because the PD binding does not
  45 -                                * currently allow us to express this
  46 -                                * relationship, we have no choice but to do
  47 -                                * this instead:
  48 -                                */
  49 -                               regulator-always-on;
  50 -
  51                                 regulator-boot-on;
  52                                 regulator-min-microvolt = <550000>;
  53                                 regulator-max-microvolt = <950000>;
  54 --
  55 2.50.1
  56