diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-12-10 02:24:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-10 02:24:26 -0800 |
| commit | b3e4ae2788f1923d6223da99e62455c138a45c86 (patch) | |
| tree | 044b38aacdafc74501d2ff6b37cefc45aa0874d0 | |
| parent | a9ef61707237a6e9d79786c84f67b2321f63b945 (diff) | |
| parent | e445e5b99ea5647dfa3b8fc57fdf4b308b523789 (diff) | |
Merge "ARM: dts: msm: remove CARVEOUT ION for msm8996 ivi multi-gvm vplatform"
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts index 8b2373e2c079..c9e0bc54e469 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2019, 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 @@ -83,14 +83,18 @@ }; }; +&ion { + /delete-node/ qcom,ion-heap@25; + + system_heap: qcom,ion-heap@25 { + reg = <25>; + qcom,ion-heap-type = "SYSTEM"; + }; +}; + &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 0x60000000 0 0x10000000>; - label = "ion_system_mem"; - }; }; |