Merge "ARM: dts: msm: Remove secure dma-buf heap support on neo"

This commit is contained in:
qctecmdr
2022-09-16 02:36:55 -07:00
committed by Gerrit - the friendly Code Review server
3 changed files with 0 additions and 91 deletions

View File

@@ -28,34 +28,6 @@
memory-region = <&lsr_misc_mem_heap>;
};
secure_lsr_lefteye_dma_buf: qcom,secure_lsr_lefteye {
qcom,dma-heap-name = "qcom,secure_lsr_lefteye";
qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
memory-region = <&secure_lsr_lefteye_mem_heap>;
qcom,token = <0x80000>;
};
secure_lsr_righteye_dma_buf: qcom,secure_lsr_righteye {
qcom,dma-heap-name = "qcom,secure_lsr_righteye";
qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
memory-region = <&secure_lsr_righteye_mem_heap>;
qcom,token = <0x80000>;
};
secure_lsr_depth_dma_buf: qcom,secure_lsr_depth {
qcom,dma-heap-name = "qcom,secure_lsr_depth";
qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
memory-region = <&secure_lsr_depth_mem_heap>;
qcom,token = <0x80000>;
};
secure_lsr_misc_dma_buf: qcom,secure_lsr_misc {
qcom,dma-heap-name = "qcom,secure_lsr_misc";
qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
memory-region = <&secure_lsr_misc_mem_heap>;
qcom,token = <0x80000>;
};
qcom,user_contig {
qcom,dma-heap-name = "qcom,user-contig";
qcom,dma-heap-type = <HEAP_TYPE_CMA>;

View File

@@ -344,37 +344,6 @@
size = <0x0 0x2800000>;
};
secure_lsr_lefteye_mem_heap: secure_lsr_lefteye_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
no-map;
alignment = <0x0 0x400000>;
size = <0x0 0xC00000>;
};
secure_lsr_righteye_mem_heap: secure_lsr_righteye_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
no-map;
alignment = <0x0 0x400000>;
size = <0x0 0xC00000>;
};
secure_lsr_depth_mem_heap: secure_lsr_depth_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
no-map;
alignment = <0x0 0x400000>;
size = <0x0 0x100000>;
};
secure_lsr_misc_mem_heap: secure_lsr_misc_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
no-map;
alignment = <0x0 0x400000>;
size = <0x0 0x2800000>;
};
audio_cma_mem: audio_cma_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

View File

@@ -145,22 +145,6 @@
status = "disabled";
};
&secure_lsr_lefteye_dma_buf {
status = "disabled";
};
&secure_lsr_righteye_dma_buf {
status = "disabled";
};
&secure_lsr_depth_dma_buf {
status = "disabled";
};
&secure_lsr_misc_dma_buf {
status = "disabled";
};
&lsr_lefteye_mem_heap {
status = "disabled";
};
@@ -177,22 +161,6 @@
status = "disabled";
};
&secure_lsr_lefteye_mem_heap {
status = "disabled";
};
&secure_lsr_righteye_mem_heap {
status = "disabled";
};
&secure_lsr_depth_mem_heap {
status = "disabled";
};
&secure_lsr_misc_mem_heap {
status = "disabled";
};
&pcie0 {
status = "ok";
};