diff --git a/qcom/kalama.dtsi b/qcom/kalama.dtsi index 30b5ff4b..62c8c49e 100644 --- a/qcom/kalama.dtsi +++ b/qcom/kalama.dtsi @@ -276,24 +276,19 @@ reg = <0x0 0x81d00000 0x0 0x200000>; }; - cpucp_fw_mem: cpucp_fw_region@81f00000 { + llcc_lpi_mem: llcc_lpi_region@82000000 { no-map; - reg = <0x0 0x81f00000 0x0 0x100000>; + reg = <0x0 0x82000000 0x0 0x600000>; }; - global_sync_mem: global_sync_region@82000000 { + global_sync_mem: global_sync_region@82600000 { no-map; - reg = <0x0 0x82000000 0x0 0x100000>; + reg = <0x0 0x82600000 0x0 0x100000>; }; - tz_stat_mem: tz_stat_region@82100000 { + tz_stat_mem: tz_stat_region@82700000 { no-map; - reg = <0x0 0x82100000 0x0 0x100000>; - }; - - llcc_lpi_mem: llcc_lpi_region@82200000 { - no-map; - reg = <0x0 0x82200000 0x0 0x600000>; + reg = <0x0 0x82700000 0x0 0x100000>; }; cdsp_secure_heap: cdsp_secure_heap_region@82800000 { @@ -301,11 +296,6 @@ reg = <0x0 0x82800000 0x0 0x4600000>; }; - camera_mem: camera_region@86e00000 { - no-map; - reg = <0x0 0x86e00000 0x0 0x500000>; - }; - video_mem: video_region@87300000 { no-map; reg = <0x0 0x87300000 0x0 0x700000>; @@ -316,24 +306,34 @@ reg = <0x0 0x87a00000 0x0 0x3a00000>; }; - cdsp_mem: cdsp_region@8b400000 { + q6_adsp_dtb_mem: q6_adsp_dtb_region@8b400000 { no-map; - reg = <0x0 0x8b400000 0x0 0x2000000>; + reg = <0x0 0x8b400000 0x0 0x80000>; }; - ipa_fw_mem: ipa_fw_region@8d400000 { + q6_cdsp_dtb_mem: q6_cdsp_dtb_region@8b480000 { no-map; - reg = <0x0 0x8d400000 0x0 0x10000>; + reg = <0x0 0x8b480000 0x0 0x80000>; }; - ipa_gsi_mem: ipa_gsi_region@8d410000 { + cdsp_mem: cdsp_region@8b500000 { no-map; - reg = <0x0 0x8d410000 0x0 0xa000>; + reg = <0x0 0x8b500000 0x0 0x2000000>; }; - gpu_micro_code_mem: gpu_micro_code_region@8d41a000 { + ipa_fw_mem: ipa_fw_region@8d500000 { no-map; - reg = <0x0 0x8d41a000 0x0 0x2000>; + reg = <0x0 0x8d500000 0x0 0x10000>; + }; + + ipa_gsi_mem: ipa_gsi_region@8d510000 { + no-map; + reg = <0x0 0x8d510000 0x0 0xa000>; + }; + + gpu_micro_code_mem: gpu_micro_code_region@8d51a000 { + no-map; + reg = <0x0 0x8d51a000 0x0 0x2000>; }; spss_region_mem: spss_region_region@8d600000 { @@ -355,41 +355,56 @@ mpss_mem: mpss_region@8d800000 { no-map; - reg = <0x0 0x8d800000 0x0 0x13200000>; + reg = <0x0 0x8d800000 0x0 0x13c00000>; }; - cvp_mem: cvp_region@a0a00000 { + q6_mpss_dtb_mem: q6_mpss_dtb_region@a1400000 { no-map; - reg = <0x0 0xa0a00000 0x0 0x700000>; + reg = <0x0 0xa1400000 0x0 0x80000>; + }; + + cvp_mem: cvp_region@a1500000 { + no-map; + reg = <0x0 0xa1500000 0x0 0x700000>; + }; + + camera_mem: camera_region@a1c00000 { + no-map; + reg = <0x0 0xa1c00000 0x0 0x800000>; }; /* uefi region can be reused by apps */ /* Linux kernel image is loaded at 0xa8000000 */ - xbl_sc_mem: xbl_sc_region@d8000000 { + cpucp_fw_mem: cpucp_fw_region@d8000000 { no-map; - reg = <0x0 0xd8000000 0x0 0x40000>; + reg = <0x0 0xd8000000 0x0 0x100000>; }; - tz_reserved_mem: tz_reserved_region@d8040000 { + xbl_sc_mem: xbl_sc_region@d8100000 { no-map; - reg = <0x0 0xd8040000 0x0 0xc0000>; + reg = <0x0 0xd8100000 0x0 0x40000>; }; - qtee_mem: qtee_region@d8100000 { + tz_reserved_mem: tz_reserved_region@d8140000 { no-map; - reg = <0x0 0xd8100000 0x0 0x500000>; + reg = <0x0 0xd8140000 0x0 0x1c0000>; }; - trusted_apps_mem: trusted_apps_region@d8600000 { + qtee_mem: qtee_region@d8300000 { no-map; - reg = <0x0 0xd8600000 0x0 0x8a00000>; + reg = <0x0 0xd8300000 0x0 0x500000>; }; - tz_tags_mem: tz_tags_region@e1000000 { + trusted_apps_mem: trusted_apps_region@d8800000 { no-map; - reg = <0x0 0xe1000000 0x0 0x2700000>; + reg = <0x0 0xd8800000 0x0 0x8a00000>; + }; + + tz_tags_mem: tz_tags_region@e1200000 { + no-map; + reg = <0x0 0xe1200000 0x0 0x2710000>; }; trust_ui_vm_mem: trust_ui_vm_region@f4400000 { @@ -397,6 +412,11 @@ reg = <0x0 0xf4400000 0x0 0x42f3000>; }; + trust_ui_vm_qrtr: trust_ui_vm_qrtr@f86f3000 { + no-map; + reg = <0x0 0xf86f3000 0x0 0x9000>; + }; + trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@f86fc000 { no-map; reg = <0x0 0xf86fc000 0x0 0x4000>; @@ -409,7 +429,6 @@ gunyah-label = <0x12>; }; - oem_vm_mem: oem_vm_region@f8800000 { no-map; reg = <0x0 0xf8800000 0x0 0x5000000>;