diff --git a/arch/arm64/boot/dts/exynos/google/zuma-akita.dts b/arch/arm64/boot/dts/exynos/google/zuma-akita.dts index 039eadf76..3b5976eed 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma-akita.dts +++ b/arch/arm64/boot/dts/exynos/google/zuma-akita.dts @@ -187,10 +187,107 @@ }; }; +&cmu_g3d { + status = "okay"; +}; + &cmu_peric1 { status = "okay"; }; +/* + * The CPU levels are zuma.dtsi's, the same as stock's on this phone, but + * the Pixel 8a's battery current limiter caps all three clusters lower + * than the Pixel 8 Pro's: 1475, 1549 and 2147 MHz on every droop and + * SMPL event (Google's zuma-akita-bcl.dtsi). There is no BCL driver here, + * so the levels above those caps are turbo-mode as well, off until boost + * is enabled: 1548 and 1704 MHz on the little cluster, 1572 to 1945 MHz + * on the mid one and 2294 MHz on the big one, on top of the 8 Pro's marks. + */ +&cpu0 { + operating-points-v2 = <&cpucl0_opp>; +}; + +&cpu1 { + operating-points-v2 = <&cpucl0_opp>; +}; + +&cpu2 { + operating-points-v2 = <&cpucl0_opp>; +}; + +&cpu3 { + operating-points-v2 = <&cpucl0_opp>; +}; + +&cpu4 { + operating-points-v2 = <&cpucl1_opp>; +}; + +&cpu5 { + operating-points-v2 = <&cpucl1_opp>; +}; + +&cpu6 { + operating-points-v2 = <&cpucl1_opp>; +}; + +&cpu7 { + operating-points-v2 = <&cpucl1_opp>; +}; + +&cpu8 { + operating-points-v2 = <&cpucl2_opp>; +}; + +&{/opp-table-cpucl0/opp-1548000000} { + turbo-mode; +}; + +&{/opp-table-cpucl0/opp-1704000000} { + turbo-mode; +}; + +&{/opp-table-cpucl1/opp-1572000000} { + turbo-mode; +}; + +&{/opp-table-cpucl1/opp-1836000000} { + turbo-mode; +}; + +&{/opp-table-cpucl1/opp-1945000000} { + turbo-mode; +}; + +&{/opp-table-cpucl2/opp-2294000000} { + turbo-mode; +}; + +/* + * The GPU's levels are zuma.dtsi's, the same shader rates as stock's on + * this phone, but the Pixel 8a's BCL caps the GPU at 649 (batoilo), 723 + * (vdroop1), 580 (vdroop2) and 649 MHz (smpl_gm), below the 8 Pro's 890. + * With no BCL driver nothing runs above stock's caps, so the levels above + * the highest of them, vdroop1's 723 MHz, are deleted here. + */ +/delete-node/ &{/opp-table-gpu/opp-807000000}; +/delete-node/ &{/opp-table-gpu/opp-850000000}; +/delete-node/ &{/opp-table-gpu/opp-890000000}; + +/* + * The GPU's core clock is ACPM's paired "gpu" clock, which sets the shader + * (G3D) and L2 (G3DL2) domains together; coregroup and stacks stay on + * CMU_G3D's gates, as on the Pixel 8 Pro. + */ +&gpu { + clocks = <&acpm_ipc ZUMA_CLK_ACPM_GPU>, + <&cmu_g3d CLK_GOUT_G3D_COREGROUP>, + <&cmu_g3d CLK_GOUT_G3D_STACKS>; + operating-points-v2 = <&gpu_opp>; + status = "okay"; +}; + /* * The battery pack's EEPROM, as on the Pixel 8 Pro: an at,24c08 at 0x50 * (Google's zuma-akita-battery.dtsi, pack_bee). Byte 0x17 is the battery diff --git a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts index 6f1c0d841..daab4bfe8 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts +++ b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts @@ -161,67 +161,6 @@ constant-charge-current-max-microamp = <1485000>; }; - /* - * The GPU's levels: the shader rates of the Pixel 8 Pro's GPU DVFS - * table, each with its paired L2 rate through the ACPM "gpu" clock, - * up to stock's 890 MHz. gpu-thermal throttles them. - */ - gpu_opp: opp-table-gpu { - compatible = "operating-points-v2"; - - opp-150000000 { - opp-hz = /bits/ 64 <150000000>; - }; - - opp-302000000 { - opp-hz = /bits/ 64 <302000000>; - }; - - opp-337000000 { - opp-hz = /bits/ 64 <337000000>; - }; - - opp-376000000 { - opp-hz = /bits/ 64 <376000000>; - }; - - opp-419000000 { - opp-hz = /bits/ 64 <419000000>; - }; - - opp-467000000 { - opp-hz = /bits/ 64 <467000000>; - }; - - opp-521000000 { - opp-hz = /bits/ 64 <521000000>; - }; - - opp-580000000 { - opp-hz = /bits/ 64 <580000000>; - }; - - opp-649000000 { - opp-hz = /bits/ 64 <649000000>; - }; - - opp-723000000 { - opp-hz = /bits/ 64 <723000000>; - }; - - opp-807000000 { - opp-hz = /bits/ 64 <807000000>; - }; - - opp-850000000 { - opp-hz = /bits/ 64 <850000000>; - }; - - opp-890000000 { - opp-hz = /bits/ 64 <890000000>; - }; - }; - reserved-memory { #address-cells = <2>; #size-cells = <1>; diff --git a/arch/arm64/boot/dts/exynos/google/zuma.dtsi b/arch/arm64/boot/dts/exynos/google/zuma.dtsi index 610a8901c..c29ee6967 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma.dtsi +++ b/arch/arm64/boot/dts/exynos/google/zuma.dtsi @@ -194,8 +194,8 @@ * (/sys/devices/system/cpu/cpufreq/boost). * * Those turbo-mode marks are the Pixel 8 Pro's caps, so the CPUs get - * operating-points-v2 in the board file. A board whose BCL caps are - * lower needs tables of its own. + * operating-points-v2 in the board file. A board whose caps are lower + * marks its extra levels turbo-mode by path, as zuma-akita.dts does. */ cpucl0_opp: opp-table-cpucl0 { compatible = "operating-points-v2"; @@ -426,6 +426,69 @@ /* 2943, 2970 and 3015 MHz stay off, as on stock. */ }; + /* + * The GPU's levels: the shader rates of the Pixel 8 Pro's GPU DVFS + * table, each with its paired L2 rate through the ACPM "gpu" clock, + * up to stock's 890 MHz, its BCL cap on VDROOP1. gpu-thermal throttles + * them. A board whose caps are lower deletes its extra levels by path, + * as zuma-akita.dts does. + */ + gpu_opp: opp-table-gpu { + compatible = "operating-points-v2"; + + opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + }; + + opp-302000000 { + opp-hz = /bits/ 64 <302000000>; + }; + + opp-337000000 { + opp-hz = /bits/ 64 <337000000>; + }; + + opp-376000000 { + opp-hz = /bits/ 64 <376000000>; + }; + + opp-419000000 { + opp-hz = /bits/ 64 <419000000>; + }; + + opp-467000000 { + opp-hz = /bits/ 64 <467000000>; + }; + + opp-521000000 { + opp-hz = /bits/ 64 <521000000>; + }; + + opp-580000000 { + opp-hz = /bits/ 64 <580000000>; + }; + + opp-649000000 { + opp-hz = /bits/ 64 <649000000>; + }; + + opp-723000000 { + opp-hz = /bits/ 64 <723000000>; + }; + + opp-807000000 { + opp-hz = /bits/ 64 <807000000>; + }; + + opp-850000000 { + opp-hz = /bits/ 64 <850000000>; + }; + + opp-890000000 { + opp-hz = /bits/ 64 <890000000>; + }; + }; + firmware { acpm_ipc: power-management { compatible = "google,zuma-acpm-ipc";