Merge "ARM: dts: msm: Update memory map to v11"

This commit is contained in:
qctecmdr
2022-08-31 12:46:48 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 27 additions and 27 deletions

View File

@@ -119,7 +119,7 @@
* first 1GB due to memory hotplug requirement.
*/
base-address = <0x0 0x28800000 >;
size-min = <0x0 0x4aee000>; /* 74 MB */
size-min = <0x0 0x40ee000>; /* 64 MB */
};
segments {

View File

@@ -511,56 +511,56 @@
trust_ui_vm_mem: trust_ui_vm_region@f3800000 {
no-map;
reg = <0x0 0xf3800000 0x0 0x4aee000>;
reg = <0x0 0xf3800000 0x0 0x40ee000>;
};
trust_ui_vm_dump: trust_ui_vm_dump@0xf82ee000 {
trust_ui_vm_dump: trust_ui_vm_dump@0xf78ee000 {
no-map;
reg = <0x0 0xf82ee000 0x0 0x1000>;
reg = <0x0 0xf78ee000 0x0 0x1000>;
};
trust_ui_vm_qrtr: trust_ui_vm_qrtr@0xf82ef000 {
trust_ui_vm_qrtr: trust_ui_vm_qrtr@0xf78ef000 {
no-map;
reg = <0x0 0xf82ef000 0x0 0x9000>;
reg = <0x0 0xf78ef000 0x0 0x9000>;
};
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@0xf82f8000 {
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring@0xf78f8000 {
no-map;
reg = <0x0 0xf82f8000 0x0 0x4000>;
reg = <0x0 0xf78f8000 0x0 0x4000>;
gunyah-label = <0x11>; //for persist.img
};
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@0xf82fc000 {
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring@0xf78fc000 {
no-map;
reg = <0x0 0xf82fc000 0x0 0x4000>;
reg = <0x0 0xf78fc000 0x0 0x4000>;
gunyah-label = <0x10>; //for system.img
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@0xf8300000 {
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb@0xf7900000 {
no-map;
reg = <0x0 0xf8300000 0x0 0x100000>;
reg = <0x0 0xf7900000 0x0 0x100000>;
gunyah-label = <0x12>;
};
oem_vm_mem: oem_vm_region@f8400000 {
compatible = "shared-dma-pool";
reg = <0x0 0xf8400000 0x0 0x4800000>;
reusable;
alignment = <0x0 0x400000>;
};
oem_vm_vblk0_ring: oem_vm_vblk0_ring@fcc00000 {
oem_vm_vblk0_ring: oem_vm_vblk0_ring@f7afc000 {
no-map;
reg = <0x0 0xfcc00000 0x0 0x4000>;
reg = <0x0 0xf7afc000 0x0 0x4000>;
gunyah-label = <0x13>;
};
oem_vm_swiotlb: oem_vm_swiotlb@fcc04000 {
oem_vm_swiotlb: oem_vm_swiotlb@f7b00000 {
no-map;
reg = <0x0 0xfcc04000 0x0 0x100000>;
reg = <0x0 0xf7b00000 0x0 0x100000>;
gunyah-label = <0x14>;
};
oem_vm_mem: oem_vm_region@f7c00000 {
compatible = "shared-dma-pool";
reg = <0x0 0xf7c00000 0x0 0x4800000>;
reusable;
alignment = <0x0 0x400000>;
};
llcc_lpi_mem: llcc_lpi_region@ff800000 {
no-map;
reg = <0x0 0xff800000 0x0 0x600000>;
@@ -3187,14 +3187,14 @@
&tlmm 57 0 &tlmm 58 0 &tlmm 59 0 &tlmm 13 0 &tlmm 48 0>;
};
trust_ui_vm: qcom,trust_ui_vm@0xf82f8000 {
reg = <0xf82f8000 0x108000>;
trust_ui_vm: qcom,trust_ui_vm@0xf78f8000 {
reg = <0xf78f8000 0x108000>;
vm_name = "trustedvm";
shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_vblk1_ring &trust_ui_vm_swiotlb>;
};
oem_vm: qcom,oem_vm@fcc00000 {
reg = <0xfcc00000 0x104000>;
oem_vm: qcom,oem_vm@f7afc000 {
reg = <0xf7afc000 0x104000>;
vm_name = "oemvm";
shared-buffers = <&oem_vm_vblk0_ring &oem_vm_swiotlb>;
};