Skip to content

Commit 44eeac8

Browse files
committed
arm64: dts: apple: t8112: 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 <[email protected]>
1 parent d12c44a commit 44eeac8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@
509509
<0x2 0x4000000 0 0x1000000>;
510510
reg-names = "asc", "sgx";
511511
mboxes = <&agx_mbox>;
512-
power-domains = <&pmp_report_gfx>;
512+
power-domains = <&ps_gfx>;
513513
memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>,
514514
<&gpu_hw_cal_a>, <&gpu_hw_cal_b>, <&gpu_globals>;
515515
memory-region-names = "ttbs", "pagetables", "handoff",
@@ -579,7 +579,7 @@
579579
reg = <0x2 0x28200000 0x0 0xc000>,
580580
<0x2 0x28400000 0x0 0x4000>;
581581
reg-names = "be", "fe";
582-
power-domains = <&pmp_report_dispdfr>, <&ps_dispdfr_be>;
582+
power-domains = <&ps_dispdfr_fe>, <&ps_dispdfr_be>;
583583
interrupt-parent = <&aic>;
584584
interrupts = <AIC_IRQ 614 IRQ_TYPE_LEVEL_HIGH>,
585585
<AIC_IRQ 618 IRQ_TYPE_LEVEL_HIGH>;
@@ -673,7 +673,7 @@
673673
<0x2 0x2c4c4430 0x0 0x100>;
674674
interrupt-parent = <&aic>;
675675
interrupts = <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>;
676-
power-domains = <&pmp_report_isp_sys>, <&ps_isp_set0>,
676+
power-domains = <&ps_isp_sys>, <&ps_isp_set0>,
677677
<&ps_isp_set1>, <&ps_isp_set2>, <&ps_isp_fe>,
678678
<&ps_isp_set4>, <&ps_isp_set5>, <&ps_isp_set6>,
679679
<&ps_isp_set7>, <&ps_isp_set8>, <&ps_isp_set9>,
@@ -734,7 +734,7 @@
734734
<0x2 0x31344000 0x0 0x4000>,
735735
<0x2 0x31800000 0x0 0x800000>;
736736
apple,bw-scratch = <&pmgr_dcp 0 4 0x5d8>;
737-
power-domains = <&pmp_report_disp0>;
737+
power-domains = <&ps_disp0_cpu0>;
738738
resets = <&ps_disp0_cpu0>;
739739
clocks = <&clk_disp0>;
740740
phandle = <&dcp>;
@@ -1702,7 +1702,7 @@
17021702
<0x2 0x71344000 0x0 0x4000>,
17031703
<0x2 0x71800000 0x0 0x800000>;
17041704
apple,bw-scratch = <&pmgr_dcp 0 4 0x5e0>;
1705-
power-domains = <&pmp_report_dispext>;
1705+
power-domains = <&ps_dispext_cpu0>;
17061706
resets = <&ps_dispext_cpu0>;
17071707
clocks = <&clk_dispext0>;
17081708
apple,dcp-index = <1>;

0 commit comments

Comments
 (0)