Skip to content

Commit 64d5440

Browse files
committed
arm64: dts: apple: t600x-j375: Move gpu properties to individual devices
t600x-j375.dtsi is used as template for M1 and M2 desktop devices. Previously the NO_GPU define was used to prevent using values from t6001-j375c / t6002-j375d on M2 based devices. This did not work as `#define NO_GPU` was removed from t602x-j474-j475.dtsi at some point. Duplicate these values in t6001-j375c.dts and t6002-j375d.dts to fix and prevent this. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent d51763c commit 64d5440

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

arch/arm64/boot/dts/apple/t6001-j375c.dts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,13 @@
4242
};
4343
};
4444

45+
&gpu {
46+
apple,avg-power-ki-only = <0.6375>;
47+
apple,avg-power-kp = <0.58>;
48+
apple,avg-power-target-filter-tc = <1>;
49+
apple,perf-base-pstate = <3>;
50+
apple,ppm-ki = <5.8>;
51+
apple,ppm-kp = <0.355>;
52+
};
53+
4554
#include "hwmon-fan-dual.dtsi"

arch/arm64/boot/dts/apple/t6002-j375d.dts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,13 @@
159159
/delete-node/ &ps_disp0_cpu0_die1;
160160
/delete-node/ &ps_disp0_fe_die1;
161161

162+
&gpu {
163+
apple,avg-power-ki-only = <0.6375>;
164+
apple,avg-power-kp = <0.58>;
165+
apple,avg-power-target-filter-tc = <1>;
166+
apple,perf-base-pstate = <3>;
167+
apple,ppm-ki = <5.8>;
168+
apple,ppm-kp = <0.355>;
169+
};
170+
162171
#include "hwmon-fan-dual.dtsi"

arch/arm64/boot/dts/apple/t600x-j375.dtsi

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -391,17 +391,6 @@
391391
status = "okay";
392392
};
393393

394-
#ifndef NO_GPU
395-
&gpu {
396-
apple,avg-power-ki-only = <0.6375>;
397-
apple,avg-power-kp = <0.58>;
398-
apple,avg-power-target-filter-tc = <1>;
399-
apple,perf-base-pstate = <3>;
400-
apple,ppm-ki = <5.8>;
401-
apple,ppm-kp = <0.355>;
402-
};
403-
#endif
404-
405394
#include "spi1-nvram.dtsi"
406395

407396
#include "hwmon-common.dtsi"

0 commit comments

Comments
 (0)