Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c5af76 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update mdsprpc apps CMA region in 8909"

parents 65d2ac60 124c8a2b

arch/arm/boot/dts/qcom/msm8909-ion.dtsi

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 2016 Linux Foundation. All rights reserved.

/* Copyright (c) 2014, 2016-2017, 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
@@ -38,5 +38,11 @@ 
			memory-region = <&modem_adsp_mem>;

			qcom,ion-heap-type = "DMA";

		};



		adsp_heap: qcom,ion-heap@22 { /* MODEM HEAP */

			reg = <22>;

			memory-region = <&adsp_mem>;

			qcom,ion-heap-type = "DMA";

		};

	};

};

arch/arm/boot/dts/qcom/msm8909.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -142,6 +142,13 @@ 
			size = <0 0x400000>;

		};



		adsp_mem: adsp_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x400000>;

		};



		cont_splash_mem: splash_region@83000000 {

			reg = <0x0 0x83000000 0x0 0xc00000>;

		};
@@ -1495,9 +1502,9 @@ 
		compatible = "qcom,msm-audio-ion";

	};



	qcom,adsprpc-mem {

		compatible = "qcom,msm-adsprpc-mem-region";

		memory-region = <&modem_adsp_mem>;

	qcom,mdsprpc-mem {

		compatible = "qcom,msm-mdsprpc-mem-region";

		memory-region = <&adsp_mem>;

	};



	qcom,msm-adsp-loader {