Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions Documentation/devicetree/bindings/clock/google,zuma-clock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ maintainers:
- Brett-Michael Green <brett@bmgvisualtech.com>

description: |
CMU_TOP supplies the HSI0 NoC and peripheral clocks to CMU_HSI0 from its
shared PLLs. CMU_HSI0 supplies USI2, the touchscreen's SPI, from the HSI0
peripheral clock; its NoC path also takes the board-level HSI0 ALT clock.
CMU_TOP supplies the HSI0 NoC and peripheral clocks to CMU_HSI0, and the
G3D clocks to CMU_G3D, from its shared PLLs. CMU_HSI0 supplies USI2, the
touchscreen's SPI, from the HSI0 peripheral clock; its NoC path also takes
the board-level HSI0 ALT clock.
CMU_TOP also supplies the PERIC1 NoC and USI input clocks to CMU_PERIC1,
which supplies USI11, the I2C bus of the battery, charger and USB-C chips.
CMU_APM supplies the APM mailbox, its internal memory and the always-on
GPIO banks from the always-on ALV PLL and the oscillator.
CMU_G3D supplies the GPU from its own two PLLs and from the G3D GLB, NOCD
and SWITCH clocks of CMU_TOP.
The external oscillator supplies the PLL reference and the oscillator mux
paths.
Clock identifiers are defined in dt-bindings/clock/google,zuma.h.
Expand All @@ -26,6 +29,7 @@ properties:
enum:
- google,zuma-cmu-top
- google,zuma-cmu-apm
- google,zuma-cmu-g3d
- google,zuma-cmu-hsi0
- google,zuma-cmu-peric0
- google,zuma-cmu-peric1
Expand Down Expand Up @@ -84,6 +88,24 @@ allOf:
- const: bus
- const: peri
- const: alt
- if:
properties:
compatible:
const: google,zuma-cmu-g3d
then:
properties:
clocks:
items:
- description: External oscillator reference clock
- description: G3D NoC clock from CMU_TOP
- description: G3D global clock from CMU_TOP
- description: G3D switch clock from CMU_TOP
clock-names:
items:
- const: oscclk
- const: bus
- const: glb
- const: switch
- if:
properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ properties:
description:
The SoC's thermal sensors, which the ACPM firmware reads on the
kernel's behalf. Cells are the sensor index (0 big, 1 mid, 2 little
CPU cluster, 3 GPU, 4 ISP, 5 TPU, and on gs201 and zumapro 6 AUR).
CPU cluster, 3 GPU, 4 ISP, 5 TPU, and on gs201, zuma and zumapro 6 AUR).
type: object
$ref: /schemas/thermal/thermal-sensor.yaml#
unevaluatedProperties: false
Expand All @@ -88,6 +88,7 @@ properties:
enum:
- google,gs101-acpm-tmu
- google,gs201-acpm-tmu
- google,zuma-acpm-tmu
- google,zumapro-acpm-tmu

"#thermal-sensor-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ properties:
- items:
- enum:
- google,gs201-mali # G710
- google,zuma-mali # G715
- google,zumapro-mali # G715 family
- mediatek,mt8196-mali
- nxp,imx95-mali # G310
Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -11199,6 +11199,7 @@ F: drivers/thermal/samsung/gs101_acpm_tmu.c
F: drivers/usb/dwc3/dwc3-google.c
F: include/dt-bindings/clock/google,gs101*
F: include/dt-bindings/clock/google,gs201*
F: include/dt-bindings/clock/google,zuma-acpm.h
F: include/dt-bindings/clock/google,zuma.h
F: include/dt-bindings/clock/google,zumapro*
K: [gG]oogle.?[tT]ensor
Expand Down
115 changes: 115 additions & 0 deletions arch/arm64/boot/dts/exynos/google/zuma-husky.dts
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,67 @@
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>;
Expand Down Expand Up @@ -259,6 +320,60 @@
};
};

&cmu_g3d {
status = "okay";
};

/* The CPU levels' turbo-mode marks are this phone's BCL caps (zuma.dtsi). */
&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>;
};

/*
* 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.
*/
&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";
};

/*
* DECON0 takes the display over from simple-framebuffer and flips DPP0
* between scanout buffers. It scans out to DSIM0, so gs-decon can switch
Expand Down
Loading