From ad46718d55222b6513221d82490b1dc373939b16 Mon Sep 17 00:00:00 2001 From: Govindaraj Rajagopal Date: Thu, 25 Aug 2022 17:21:46 +0530 Subject: [PATCH] ARM: dts: msm: Remove secure dma-buf heap support on neo Removed below secure dma-buf pool support on neo. 1. qcom,secure_lsr_lefteye 2. qcom,secure_lsr_righteye 3. qcom,secure_lsr_depth 4. qcom,secure_lsr_misc. Change-Id: Ibd59db4d3c1b67ca09228739f26cf2e001ab9581 --- qcom/neo-dma-heaps.dtsi | 28 ---------------------------- qcom/neo.dtsi | 31 ------------------------------- qcom/neo_la.dtsi | 32 -------------------------------- 3 files changed, 91 deletions(-) diff --git a/qcom/neo-dma-heaps.dtsi b/qcom/neo-dma-heaps.dtsi index 356f7a8a..b9dffeff 100644 --- a/qcom/neo-dma-heaps.dtsi +++ b/qcom/neo-dma-heaps.dtsi @@ -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 = ; - 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 = ; - 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 = ; - 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 = ; - memory-region = <&secure_lsr_misc_mem_heap>; - qcom,token = <0x80000>; - }; - qcom,user_contig { qcom,dma-heap-name = "qcom,user-contig"; qcom,dma-heap-type = ; diff --git a/qcom/neo.dtsi b/qcom/neo.dtsi index c4b284a1..6b5c4c89 100644 --- a/qcom/neo.dtsi +++ b/qcom/neo.dtsi @@ -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>; diff --git a/qcom/neo_la.dtsi b/qcom/neo_la.dtsi index 09272f8c..eb9cf85e 100644 --- a/qcom/neo_la.dtsi +++ b/qcom/neo_la.dtsi @@ -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"; };