diff options
| author | Liam Mark <lmark@codeaurora.org> | 2016-03-21 15:57:32 -0700 |
|---|---|---|
| committer | Bryan Huntsman <bryanh@codeaurora.org> | 2016-04-12 15:49:35 -0700 |
| commit | 738690cf5d182e0f4b894fbd0bb312eb8234546b (patch) | |
| tree | bc8c78554d5ea3d5751740aaacd295c42179191c | |
| parent | d6c535157f829b93ac5bcde6dc4d318c270f7436 (diff) | |
ARM: dts: msm: add ion cma heaps for msmcobalt
Add the required ion cma heaps for msmcobalt.
Update the Device Tree with the concerned configuration.
Change-Id: Ie4bd19b0603e856107151972b626c70f9d04a624
Signed-off-by: Liam Mark <lmark@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi | 25 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 24 |
2 files changed, 48 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi index 77d13c674bc4..09a2b799d9aa 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -25,5 +25,28 @@ reg = <21>; qcom,ion-heap-type = "SYSTEM_CONTIG"; }; + + qcom,ion-heap@22 { /* ADSP HEAP */ + reg = <22>; + memory-region = <&adsp_mem>; + qcom,ion-heap-type = "DMA"; + }; + + qcom,ion-heap@27 { /* QSEECOM HEAP */ + reg = <27>; + memory-region = <&qseecom_mem>; + qcom,ion-heap-type = "DMA"; + }; + + qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */ + reg = <10>; + memory-region = <&secure_display_memory>; + qcom,ion-heap-type = "HYP_CMA"; + }; + + qcom,ion-heap@9 { + reg = <9>; + qcom,ion-heap-type = "SYSTEM_SECURE"; + }; }; }; diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 12a78cb40a0a..d14c7648ff12 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -261,6 +261,30 @@ no-map; reg = <0 0x8ab00000 0 0x100000>; }; + + adsp_mem: adsp_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0 0x00000000 0 0xffffffff>; + reusable; + alignment = <0 0x100000>; + size = <0 0x400000>; + }; + + qseecom_mem: qseecom_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0 0x00000000 0 0xffffffff>; + reusable; + alignment = <0 0x400000>; + size = <0 0x1400000>; + }; + + secure_display_memory: secure_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0 0x00000000 0 0xffffffff>; + reusable; + alignment = <0 0x200000>; + size = <0 0x5c00000>; + }; }; }; |