Skip to content

Commit e43ac44

Browse files
committed
arm64: dts: apple: t602x: 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 5493704 commit e43ac44

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@
540540
#iommu-cells = <1>;
541541
interrupt-parent = <&aic>;
542542
interrupts = <AIC_IRQ 0 574 IRQ_TYPE_LEVEL_HIGH>;
543-
power-domains = <&pmp_report_isp_sys>;
543+
power-domains = <&ps_isp_sys>;
544544

545545
apple,dma-range = <0x100 0x0 0x1 0x0>;
546546
status = "disabled";
@@ -612,7 +612,7 @@
612612
<0x3 0x89344000 0x0 0x4000>,
613613
<0x3 0x89800000 0x0 0x800000>;
614614
apple,bw-scratch = <&pmgr_dcp 0 4 0x1208>;
615-
power-domains = <&pmp_report_disp0>;
615+
power-domains = <&ps_disp0_cpu0>;
616616
resets = <&ps_disp0_cpu0>;
617617
clocks = <&clk_disp0>;
618618
phandle = <&dcp>;
@@ -941,7 +941,7 @@
941941
<AIC_IRQ 0 1149 IRQ_TYPE_LEVEL_HIGH>,
942942
<AIC_IRQ 0 1142 IRQ_TYPE_LEVEL_HIGH>;
943943
mboxes = <&agx_mbox>;
944-
power-domains = <&pmp_report_gfx>;
944+
power-domains = <&ps_gfx>;
945945
memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>,
946946
<&gpu_hw_cal_a>, <&gpu_hw_cal_b>, <&gpu_globals>;
947947
memory-region-names = "ttbs", "pagetables", "handoff",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<0x2 0x89344000 0x0 0x4000>,
7575
<0x2 0x89800000 0x0 0x800000>;
7676
apple,bw-scratch = <&pmgr_dcp 0 4 0x1210>;
77-
power-domains = <&DIE_NODE(pmp_report_dispext0)>;
77+
power-domains = <&DIE_NODE(ps_dispext0_cpu0)>;
7878
resets = <&DIE_NODE(ps_dispext0_cpu0)>;
7979
clocks = <&DIE_NODE(clk_dispext0)>;
8080
phandle = <&DIE_NODE(dcpext0)>;
@@ -222,7 +222,7 @@
222222
<0x3 0x15344000 0x0 0x4000>,
223223
<0x3 0x15800000 0x0 0x800000>;
224224
apple,bw-scratch = <&pmgr_dcp 0 4 0x1218>;
225-
power-domains = <&DIE_NODE(pmp_report_dispext1)>;
225+
power-domains = <&DIE_NODE(ps_dispext1_cpu0)>;
226226
resets = <&DIE_NODE(ps_dispext1_cpu0)>;
227227
clocks = <&DIE_NODE(clk_dispext1)>;
228228
phandle = <&DIE_NODE(dcpext1)>;

0 commit comments

Comments
 (0)