Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm64/boot/dts/apple/t6020.dtsi b/arch/arm64/boot/dts/apple/t6020.dtsi
- index 375e59f48ab0..a0ea6e73f5ea 100644
- --- a/arch/arm64/boot/dts/apple/t6020.dtsi
- +++ b/arch/arm64/boot/dts/apple/t6020.dtsi
- @@ -28,7 +28,15 @@ / {
- /delete-node/ &pmp_report_afnc5_ioa;
- &pmp {
- - apple,pio-ranges;
- + /* apple,pio-ranges; */
- + /* apple,pio-ranges = <0x2 0x80000000 0x0 0x1000000>, */
- + /* <0x3 0x0 0x0 0x1000000>, */
- + /* <0x3 0x80000000 0x0 0x1000000>, */
- + /* <0x4 0x0 0x0 0x1000000>, */
- + /* <0x3 0x40000000 0x0 0x1000000>, */
- + /* <0x2 0x10e70000 0x0 0x90000>, */
- + /* <0x2 0x11e70000 0x0 0x90000>, */
- + /* <0x2 0x12e70000 0x0 0x90000>; */
- };
- &gpu {
- diff --git a/arch/arm64/boot/dts/apple/t6021.dtsi b/arch/arm64/boot/dts/apple/t6021.dtsi
- index 44c3b09ad46c..671904295002 100644
- --- a/arch/arm64/boot/dts/apple/t6021.dtsi
- +++ b/arch/arm64/boot/dts/apple/t6021.dtsi
- @@ -74,16 +74,16 @@ p-core-pmu-affinity {
- };
- &pmp {
- - apple,pio-ranges = <0x2 0x80000000 0x0 0x1000000>,
- - <0x3 0x0 0x0 0x1000000>,
- - <0x3 0x80000000 0x0 0x1000000>,
- - <0x4 0x0 0x0 0x1000000>,
- - <0x3 0x40000000 0x0 0x1000000>,
- - <0x2 0x10e70000 0x0 0x90000>,
- - <0x2 0x11e70000 0x0 0x90000>,
- - <0x2 0x12e70000 0x0 0x90000>,
- - <0x4 0x80000000 0x0 0x1000000>,
- - <0x5 0x0 0x0 0x1000000>;
- + /* apple,pio-ranges = <0x2 0x80000000 0x0 0x1000000>, */
- + /* <0x3 0x0 0x0 0x1000000>, */
- + /* <0x3 0x80000000 0x0 0x1000000>, */
- + /* <0x4 0x0 0x0 0x1000000>, */
- + /* <0x3 0x40000000 0x0 0x1000000>, */
- + /* <0x2 0x10e70000 0x0 0x90000>, */
- + /* <0x2 0x11e70000 0x0 0x90000>, */
- + /* <0x2 0x12e70000 0x0 0x90000>, */
- + /* <0x4 0x80000000 0x0 0x1000000>, */
- + /* <0x5 0x0 0x0 0x1000000>; */
- };
- &gpu {
- diff --git a/arch/arm64/boot/dts/apple/t602x-die0.dtsi b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
- index 9cfb411a98f2..7553bc9f23b4 100644
- --- a/arch/arm64/boot/dts/apple/t602x-die0.dtsi
- +++ b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
- @@ -48,14 +48,14 @@ pmp_report: pmp_report@28e3c0000 {
- #address-cells = <1>;
- #size-cells = <0>;
- - pmp_report_gfx: report@a {
- - compatible = "apple,t6020-pmp-v2-report-entry",
- - "apple,t6000-pmp-v2-report-entry";
- - reg = <0xa>;
- - label = "pmp-gfx";
- - #power-domain-cells = <0>;
- - power-domains = <&ps_gfx>;
- - };
- + /* pmp_report_gfx: report@a { */
- + /* compatible = "apple,t6020-pmp-v2-report-entry", */
- + /* "apple,t6000-pmp-v2-report-entry"; */
- + /* reg = <0xa>; */
- + /* label = "pmp-gfx"; */
- + /* #power-domain-cells = <0>; */
- + /* power-domains = <&ps_gfx>; */
- + /* }; */
- pmp_report_ane_sys: report@b {
- compatible = "apple,t6020-pmp-v2-report-entry",
- @@ -233,7 +233,7 @@ pmgr_dcp: power-management@28e3d0000 {
- pmp: pmp@28e700000 {
- compatible = "apple,t6020-pmp-v2", "apple,t6000-pmp-v2";
- reg = <0x2 0x8e700000 0x0 0x100000>,
- - <0x2 0x8ec00000 0x0 0x4000>;
- + <0x2 0x8ec00000 0x0 0x6c000>;
- reg-names = "pmp", "asc";
- mboxes = <&pmp_mbox>;
- mbox-names = "mbox";
- @@ -990,11 +990,11 @@ gpu: gpu@406400000 {
- <AIC_IRQ 0 1149 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 0 1142 IRQ_TYPE_LEVEL_HIGH>;
- mboxes = <&agx_mbox>;
- - #ifdef APPLE_USE_PMP
- - power-domains = <&pmp_report_gfx>;
- - #else
- + /* #ifdef APPLE_USE_PMP */
- + /* power-domains = <&pmp_report_gfx>; */
- + /* #else */
- power-domains = <&ps_gfx>;
- - #endif
- + /* #endif */
- memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>,
- <&gpu_hw_cal_a>, <&gpu_hw_cal_b>, <&gpu_globals>;
- memory-region-names = "ttbs", "pagetables", "handoff",
- diff --git a/arch/arm64/boot/dts/apple/t602x-pmgr.dtsi b/arch/arm64/boot/dts/apple/t602x-pmgr.dtsi
- index b9233f252e6c..a4507060db70 100644
- --- a/arch/arm64/boot/dts/apple/t602x-pmgr.dtsi
- +++ b/arch/arm64/boot/dts/apple/t602x-pmgr.dtsi
- @@ -454,6 +454,7 @@ DIE_NODE(ps_pmp): power-controller@2c8 {
- #power-domain-cells = <0>;
- #reset-cells = <0>;
- label = DIE_LABEL(pmp);
- + apple,always-on;
- };
- DIE_NODE(ps_pms_sram): power-controller@2d0 {
- @@ -462,6 +463,7 @@ DIE_NODE(ps_pms_sram): power-controller@2d0 {
- #power-domain-cells = <0>;
- #reset-cells = <0>;
- label = DIE_LABEL(pms_sram);
- + apple,always-on;
- };
- DIE_NODE(ps_dispext0_cpu0): power-controller@2d8 {
Advertisement
Add Comment
Please, Sign In to add comment