diff options
| author | Yimin Peng <yiminp@codeaurora.org> | 2017-11-21 16:27:28 +0800 |
|---|---|---|
| committer | Yimin Peng <yiminp@codeaurora.org> | 2017-12-15 10:06:34 +0800 |
| commit | 70830b4ce9c5b47e1dc824746bd04a76d2edafea (patch) | |
| tree | e47c2ceca5251698077f3d9c7016d6e1b8d4de01 /arch | |
| parent | e16178f1c0b45c06f640903275a80e95735ae0b3 (diff) | |
ARM: dts: msm: memory rework for gvm on msm8996
Split memory configuration for different projects.
Change-Id: I2928adb05dfe174a2d8413172ed10f4240f3f42d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Diffstat (limited to 'arch')
4 files changed, 19 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi index 045cc44b2d4c..8f7773a87816 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi @@ -27,11 +27,5 @@ memory-region = <&qseecom_mem>; qcom,ion-heap-type = "DMA"; }; - - qcom,ion-heap@28 { /* Audio Heap */ - reg = <28>; - memory-region = <&ion_audio>; - qcom,ion-heap-type = "CARVEOUT"; - }; }; }; diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts index 7543950c9cef..f4ddc20e4488 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts @@ -41,3 +41,15 @@ &blsp1_uart2 { status = "okay"; }; + +&reserved_memory { + pmem_shared: pmem_shared_region@d0000000 { + reg = <0 0xd0000000 0 0x20000000>; + label = "pmem_shared_mem"; + }; + + ion_system: ion_system_region@100000000 { + reg = <0x1 0x0 0 0x10000000>; + label = "ion_system_mem"; + }; +}; diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts index 9057fb315c65..18821889b150 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts @@ -34,11 +34,13 @@ no-map; reg = <0 0x88800000 0 0x6200000>; }; + peripheral_mem: peripheral_region@8ea00000 { compatible = "removed-dma-pool"; no-map; reg = <0 0x8ea00000 0 0x2b00000>; }; + adsp_mem: adsp_region { compatible = "shared-dma-pool"; alloc-ranges = <0 0x00000000 0 0xffffffff>; @@ -46,6 +48,11 @@ alignment = <0 0x100000>; size = <0 0x400000>; }; + + ion_system: ion_system_region@ff000000 { + reg = <0 0xff000000 0 0x00400000>; + label = "ion_system_mem"; + }; }; &soc { diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi index 2a9aaf575fb2..621672b139f7 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi @@ -35,14 +35,6 @@ #size-cells = <2>; ranges; - pmem_shared: pmem_shared_region { - reg = <0 0xd0000000 0 0x20000000>; - label = "pmem_shared_mem"; - }; - ion_system: ion_system_region { - reg = <0x1 0x0 0 0x10000000>; - label = "ion_system_mem"; - }; qseecom_mem: qseecom_region { compatible = "shared-dma-pool"; alloc-ranges = <0 0x00000000 0 0xffffffff>; @@ -50,10 +42,6 @@ alignment = <0 0x400000>; size = <0 0x1400000>; }; - ion_audio: ion_audio_region { - reg = <0 0xc8000000 0 0x00400000>; - label = "ion_audio_mem"; - }; }; }; |