Skip to content

Commit 5493704

Browse files
committed
arm64: dts: apple: t600x: Do no use pmp_report_* power-domains
This is a devicetree incompatibility. The best thing we probably can do is a staged rollout. First ship kernel releases with pmp-report support and use the pmp_report_* power-domains only later. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 44eeac8 commit 5493704

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
<0x3 0x8b344000 0x0 0x4000>,
520520
<0x3 0x8b800000 0x0 0x800000>;
521521
apple,bw-scratch = <&pmgr_dcp 0 4 0x988>;
522-
power-domains = <&pmp_report_disp0>;
522+
power-domains = <&ps_disp0_cpu0>;
523523
resets = <&ps_disp0_cpu0>;
524524
clocks = <&clk_disp0>;
525525
phandle = <&dcp>;
@@ -731,7 +731,7 @@
731731
<0x4 0x4000000 0 0x1000000>;
732732
reg-names = "asc", "sgx";
733733
mboxes = <&agx_mbox>;
734-
power-domains = <&pmp_report_gfx>;
734+
power-domains = <&ps_gfx>;
735735
memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>,
736736
<&gpu_hw_cal_a>, <&gpu_hw_cal_b>, <&gpu_globals>;
737737
memory-region-names = "ttbs", "pagetables", "handoff",
@@ -830,7 +830,7 @@
830830
<0x3 0x861043f0 0x0 0x100>;
831831
interrupt-parent = <&aic>;
832832
interrupts = <AIC_IRQ 0 538 IRQ_TYPE_LEVEL_HIGH>;
833-
power-domains = <&pmp_report_isp_sys>, <&ps_isp_set0>,
833+
power-domains = <&ps_isp_sys>, <&ps_isp_set0>,
834834
<&ps_isp_set1>, <&ps_isp_fe>, <&ps_isp_set3>,
835835
<&ps_isp_set4>, <&ps_isp_set5>, <&ps_isp_set6>,
836836
<&ps_isp_set7>, <&ps_isp_set8>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<0x2 0x89344000 0x0 0x4000>,
7676
<0x2 0x89800000 0x0 0x800000>;
7777
apple,bw-scratch = <&pmgr_dcp 0 4 0x990>;
78-
power-domains = <&DIE_NODE(pmp_report_dispext0)>;
78+
power-domains = <&DIE_NODE(ps_dispext0_cpu0)>;
7979
resets = <&DIE_NODE(ps_dispext0_cpu0)>;
8080
clocks = <&DIE_NODE(clk_dispext0)>;
8181
phandle = <&DIE_NODE(dcpext0)>;
@@ -152,7 +152,7 @@
152152
<0x2 0x8c344000 0x0 0x4000>,
153153
<0x2 0x8c800000 0x0 0x800000>;
154154
apple,bw-scratch = <&pmgr_dcp 0 4 0x998>;
155-
power-domains = <&DIE_NODE(pmp_report_dispext1)>;
155+
power-domains = <&DIE_NODE(ps_dispext1_cpu0)>;
156156
resets = <&DIE_NODE(ps_dispext1_cpu0)>;
157157
clocks = <&DIE_NODE(clk_dispext1)>;
158158
phandle = <&DIE_NODE(dcpext1)>;

0 commit comments

Comments
 (0)