evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: remove CARVEOUT ION for msm8996 ivi multi-gvm vplatform"

Browse source
This commit is contained in:
Linux Build Service Account 2019-12-10 02:24:26 -08:00 • committed by Gerrit - the friendly Code Review server
commit b3e4ae2788
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts
View file

@ -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 * 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 * 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 { &reserved_memory {
pmem_shared: pmem_shared_region@d0000000 { pmem_shared: pmem_shared_region@d0000000 {
reg = <0 0xd0000000 0 0x20000000>; reg = <0 0xd0000000 0 0x20000000>;
label = "pmem_shared_mem"; label = "pmem_shared_mem";
}; };
ion_system: ion_system_region@100000000 {
reg = <0x1 0x60000000 0 0x10000000>;
label = "ion_system_mem";
};
}; };