Merge "ARM: dts: msm: set ION type to SYSTEM for msm8996 telematics" (8fbab95a) · Commits · e / devices / android_kernel_sony_msm8998

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

+2 −2

Original line number	Diff line number	Diff line
		/* 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
		* it under the terms of the GNU General Public License version 2 and
		@@ -11,7 +11,7 @@
		*/

		&soc {
		qcom,ion {
		ion: qcom,ion {
		compatible = "qcom,msm-ion";
		#address-cells = <1>;
		#size-cells = <0>;

+9 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,15 @@
		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 {
		modem_mem: modem_region@88800000 {
		compatible = "removed-dma-pool";
		@@ -48,11 +57,6 @@
		alignment = <0 0x100000>;
		size = <0 0x400000>;
		};

		ion_system: ion_system_region@ff000000 {
		reg = <0 0xff000000 0 0x00400000>;
		label = "ion_system_mem";
		};
		};

		&soc {