Skip to content

Device tree updates for DCP runtime PM support #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcan merged 12 commits into from
Jan 22, 2023
Merged

Device tree updates for DCP runtime PM support #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
51dd486
fixup! arch: arm64: dts: apple: t600x: Add ATCPHY nodes
jannau Dec 5, 2022
0d6a256
fixup! arm64: dts: apple: t8112: Add ATCPHY nodes
jannau Dec 5, 2022
8e5fab7
fixup! arch: arm64: apple: t600x: Add display controller related devi…
jannau Dec 29, 2022
13594c9
fixup! arch: arm64: apple: Add display controller related device tree…
jannau Dec 29, 2022
451e67f
fixup! arm64: dts: apple: t8112: Add dcp/disp0 nodes
jannau Dec 29, 2022
cbaca68
arm64: dts: apple: t600x: Add DCP power domain to missing devices
marcan Dec 12, 2022
7f247c4
arm64: dts: apple: t8103: Add DCP power domain to missing devices
marcan Dec 12, 2022
77af86a
arm64: dts: apple: t8112: Add DCP power domain to missing devices
marcan Dec 12, 2022
9aa6230
arm64: dts: apple: t8103: Add missing ps_pmp dependency to ps_gfx
jannau Dec 30, 2022
e63de4a
arm64: dts: apple: t600x: Add "ps_disp0_cpu0" as resets for dcp
jannau Jan 8, 2023
3064ef6
arm64: dts: apple: t8103: Add "ps_disp0_cpu0" as resets for dcp
jannau Jan 8, 2023
da8202d
arm64: dts: apple: t8112: Add "ps_disp0_cpu0" as resets for dcp
jannau Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion arch/arm64/boot/dts/apple/t600x-die0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 821 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
power-domains = <&ps_disp0_cpu0>;
};

dcp_dart: iommu@38b30c000 {
Expand All @@ -186,6 +187,7 @@
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 821 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_disp0_cpu0>;
};

dcp_mbox: mbox@38bc08000 {
Expand Down Expand Up @@ -217,15 +219,16 @@
<0x3 0x8b800000 0x0 0x800000>,
<0x2 0x8e3d0000 0x0 0x4000>;
power-domains = <&ps_disp0_cpu0>;
resets = <&ps_disp0_cpu0>;
clocks = <&clk_disp0>;
apple,asc-dram-mask = <0x1f0 0x00000000>;
apple,piodma-mapper = <&disp0_piodma>;
phandle = <&dcp>;
};

display: display-subsystem {
compatible = "apple,display-subsystem";
iommus = <&disp0_dart 0>;
apple,coprocessors = <&dcp>;
/* generate phandle explicitly for use in loader */
phandle = <&display>;
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/apple/t600x-dieX.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&DIE_NODE(ps_atc0_usb)>;
};

Expand Down Expand Up @@ -448,6 +449,7 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&DIE_NODE(ps_atc1_usb)>;
};

Expand Down Expand Up @@ -520,6 +522,7 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&DIE_NODE(ps_atc2_usb)>;
};

Expand Down Expand Up @@ -592,5 +595,6 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&DIE_NODE(ps_atc3_usb)>;
};
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
/* Format properties will be added by loader */
backlight = <&backlight>;
status = "disabled";
power-domains = <&ps_disp0_cpu0>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t600x-j375.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
reg = <0 0 0 0>; /* To be filled by loader */
/* Format properties will be added by loader */
status = "disabled";
power-domains = <&ps_disp0_cpu0>;
};
};

Expand Down
3 changes: 1 addition & 2 deletions arch/arm64/boot/dts/apple/t600x-pmgr.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,6 @@
#reset-cells = <0>;
label = DIE_LABEL(disp0_fe);
power-domains = <&DIE_NODE(ps_afnc2_lw0)>;
apple,always-on; /* TODO: figure out if we can enable PM here */
};

DIE_NODE(ps_disp0_cpu0): power-controller@350 {
Expand All @@ -1303,7 +1302,7 @@
#reset-cells = <0>;
label = DIE_LABEL(disp0_cpu0);
power-domains = <&DIE_NODE(ps_disp0_fe)>;
apple,always-on; /* TODO: figure out if we can enable PM here */
apple,always-on;
apple,min-state = <4>;
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
framebuffer0: framebuffer@0 {
compatible = "apple,simple-framebuffer", "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
power-domains = <&ps_disp0_cpu0>;
/* Format properties will be added by loader */
status = "disabled";
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/apple/t8103-pmgr.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@
#reset-cells = <0>;
label = "disp0_fe";
power-domains = <&ps_rmx>, <&ps_pmp>;
apple,always-on; /* TODO: figure out if we can enable PM here */
};

ps_dispext_fe: power-controller@368 {
Expand Down Expand Up @@ -734,6 +733,7 @@
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "gfx";
power-domains = <&ps_pmp>;
};

ps_dcs4: power-controller@320 {
Expand Down Expand Up @@ -1001,7 +1001,7 @@
#reset-cells = <0>;
label = "disp0_cpu0";
power-domains = <&ps_disp0_fe>;
apple,always-on; /* TODO: figure out if we can enable PM here */
apple,always-on;
apple,min-state = <4>;
};
};
Expand Down
5 changes: 4 additions & 1 deletion arch/arm64/boot/dts/apple/t8103.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 445 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_disp0_cpu0>;
status = "disabled";
};

Expand All @@ -533,6 +534,7 @@
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 445 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_disp0_cpu0>;
};

dcp_mbox: mbox@231c08000 {
Expand Down Expand Up @@ -567,15 +569,16 @@
<0x2 0x3b738000 0x0 0x1000>,
<0x2 0x3bc3c000 0x0 0x1000>;
power-domains = <&ps_disp0_cpu0>;
resets = <&ps_disp0_cpu0>;
clocks = <&clk_disp0>;
apple,asc-dram-mask = <0xf 0x00000000>;
apple,piodma-mapper = <&disp0_piodma>;
phandle = <&dcp>;
};

display: display-subsystem {
compatible = "apple,display-subsystem";
iommus = <&disp0_dart 0>;
apple,coprocessors = <&dcp>;
/* generate phandle explicitly for use in loader */
phandle = <&display>;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t8112-jxxx.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
framebuffer0: framebuffer@0 {
compatible = "apple,simple-framebuffer", "simple-framebuffer";
reg = <0 0 0 0>; /* To be filled by loader */
power-domains = <&ps_disp0_cpu0>;
/* Format properties will be added by loader */
status = "disabled";
};
Expand Down
3 changes: 1 addition & 2 deletions arch/arm64/boot/dts/apple/t8112-pmgr.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,6 @@
#reset-cells = <0>;
label = "disp0_sys";
power-domains = <&ps_rmx1>;
apple,always-on; /* TODO: figure out if we can enable PM here */
};

ps_disp0_fe: power-controller@378 {
Expand All @@ -673,7 +672,6 @@
#reset-cells = <0>;
label = "disp0_fe";
power-domains = <&ps_disp0_sys>;
apple,always-on; /* TODO: figure out if we can enable PM here */
};

ps_dispext_sys: power-controller@380 {
Expand Down Expand Up @@ -1017,6 +1015,7 @@
label = "disp0_cpu0";
power-domains = <&ps_disp0_fe>;
apple,min-state = <4>;
apple,always-on;
};
};

Expand Down
7 changes: 6 additions & 1 deletion arch/arm64/boot/dts/apple/t8112.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 553 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_disp0_cpu0>;
status = "disabled";
};

Expand All @@ -553,6 +554,7 @@
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 553 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_disp0_cpu0>;
};

dcp_mbox: mbox@231c08000 {
Expand Down Expand Up @@ -587,16 +589,17 @@
<0x2 0x3b730000 0x0 0x1000>,
<0x2 0x3bc3c000 0x0 0x1000>;
power-domains = <&ps_disp0_cpu0>;
resets = <&ps_disp0_cpu0>;
clocks = <&clk_disp0>;
apple,asc-dram-mask = <0x0 0x0>;
apple,piodma-mapper = <&disp0_piodma>;
phandle = <&dcp>;
};

display: display-subsystem {
compatible = "apple,display-subsystem";
/* disp_dart0 must be 1st since it is locked */
iommus = <&disp0_dart 0>;
apple,coprocessors = <&dcp>;
/* generate phandle explicitly for use in loader */
phandle = <&display>;
};
Expand Down Expand Up @@ -1313,6 +1316,7 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&ps_atc0_usb>;
};

Expand Down Expand Up @@ -1383,6 +1387,7 @@

orientation-switch;
mode-switch;
svid = <0xff01>, <0x8087>;
power-domains = <&ps_atc1_usb>;
};

Expand Down