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

Merge "ARM: dts: msm: set ION type to SYSTEM for msm8996 telematics"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-20 08:36:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8fbab95a99
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2017-2018, 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
@ -11,7 +11,7 @@
*/ */
&soc { &soc {
qcom,ion { ion: qcom,ion {
compatible = "qcom,msm-ion"; compatible = "qcom,msm-ion";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

14
arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
View file

@ -28,6 +28,15 @@
qcom,msm-id = <246 0x0>; qcom,msm-id = <246 0x0>;
}; };
&ion {
/delete-node/ qcom,ion-heap@25;
system_heap: qcom,ion-heap@25 {
reg = <25>;
qcom,ion-heap-type = "SYSTEM";
};
};
&reserved_memory { &reserved_memory {
modem_mem: modem_region@88800000 { modem_mem: modem_region@88800000 {
compatible = "removed-dma-pool"; compatible = "removed-dma-pool";
@ -48,11 +57,6 @@
alignment = <0 0x100000>; alignment = <0 0x100000>;
size = <0 0x400000>; size = <0 0x400000>;
}; };
ion_system: ion_system_region@ff000000 {
reg = <0 0xff000000 0 0x00400000>;
label = "ion_system_mem";
};
}; };
&soc { &soc {