Skip to content

Commit 7984641

Browse files
WhatAmISupposedToPutHerejannau
authored andcommitted
fixup! arm64: dts: apple: Add PMP nodes and hook up power reporting
1 parent 8442d28 commit 7984641

File tree

5 files changed

+41
-8
lines changed

5 files changed

+41
-8
lines changed

arch/arm64/boot/dts/apple/t6000.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/delete-node/ &pmp_report_venc1;
2424
/delete-node/ &pmp_report_msr1;
2525
/delete-node/ &pmp_report_prores;
26+
/delete-node/ &pmp_report_afnc4_ioa;
27+
/delete-node/ &pmp_report_afnc5_ioa;
2628

2729
&pmp {
2830
apple,pio-ranges = <0x2 0x82000000 0x0 0x1000000>,

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@
5050
#address-cells = <1>;
5151
#size-cells = <0>;
5252

53-
pmp_report_gfx: report@9 {
54-
compatible = "apple,t6000-pmp-v2-report-entry";
55-
reg = <0x9>;
56-
label = "pmp-gfx";
57-
#power-domain-cells = <0>;
58-
power-domains = <&ps_gfx>;
59-
};
60-
6153
pmp_report_ane_sys: report@a {
6254
compatible = "apple,t6000-pmp-v2-report-entry";
6355
reg = <0xa>;
@@ -90,6 +82,7 @@
9082
label = "pmp-dispext0";
9183
#power-domain-cells = <0>;
9284
power-domains = <&ps_dispext0_cpu0>;
85+
apple,always-on;
9386
};
9487

9588
pmp_report_dispext1: report@e {
@@ -145,6 +138,22 @@
145138
status = "disabled";
146139
};
147140

141+
pmp_report_afnc4_ioa: report@1d {
142+
compatible = "apple,t6000-pmp-v2-report-entry";
143+
reg = <0x1d>;
144+
label = "pmp-afnc4-ioa";
145+
#power-domain-cells = <0>;
146+
apple,always-on;
147+
};
148+
149+
pmp_report_afnc5_ioa: report@1e {
150+
compatible = "apple,t6000-pmp-v2-report-entry";
151+
reg = <0x1e>;
152+
label = "pmp-afnc5-ioa";
153+
#power-domain-cells = <0>;
154+
apple,always-on;
155+
};
156+
148157
pmp_report_dispext2: report@20 {
149158
compatible = "apple,t6000-pmp-v2-report-entry";
150159
reg = <0x20>;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@
426426
#power-domain-cells = <0>;
427427
#reset-cells = <0>;
428428
label = DIE_LABEL(pmp);
429+
apple,always-on;
429430
};
430431
#endif
431432

@@ -435,6 +436,7 @@
435436
#power-domain-cells = <0>;
436437
#reset-cells = <0>;
437438
label = DIE_LABEL(pms_sram);
439+
apple,always-on;
438440
};
439441

440442
DIE_NODE(ps_apcie_st_sys): power-controller@2e8 {

arch/arm64/boot/dts/apple/t6020.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/delete-node/ &pmp_report_venc1;
2424
/delete-node/ &pmp_report_msr1;
2525
/delete-node/ &pmp_report_prores;
26+
/delete-node/ &pmp_report_afnc4_ioa;
27+
/delete-node/ &pmp_report_afnc5_ioa;
2628

2729
&pmp {
2830
apple,pio-ranges = <0x2 0x80000000 0x0 0x1000000>,

arch/arm64/boot/dts/apple/t602x-die0.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,24 @@
154154
status = "disabled";
155155
};
156156

157+
pmp_report_afnc4_ioa: report@1d {
158+
compatible = "apple,t6020-pmp-v2-report-entry",
159+
"apple,t6000-pmp-v2-report-entry";
160+
reg = <0x1d>;
161+
label = "pmp-afnc4-ioa";
162+
#power-domain-cells = <0>;
163+
apple,always-on;
164+
};
165+
166+
pmp_report_afnc5_ioa: report@1e {
167+
compatible = "apple,t6020-pmp-v2-report-entry",
168+
"apple,t6000-pmp-v2-report-entry";
169+
reg = <0x1e>;
170+
label = "pmp-afnc5-ioa";
171+
#power-domain-cells = <0>;
172+
apple,always-on;
173+
};
174+
157175
pmp_report_dispext2: report@1f {
158176
compatible = "apple,t6020-pmp-v2-report-entry",
159177
"apple,t6000-pmp-v2-report-entry";

0 commit comments

Comments
 (0)