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

Commit 3fc4ced6 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: Have adsp heap use secure memory CMA pool for 8992"

parents c2f3455d d65a9e91

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

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

/* Copyright (c) 2014-2015, 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
@@ -37,7 +37,7 @@ 


		qcom,ion-heap@22 { /* adsp heap */

			reg = <22>;

			linux,contiguous-region = <&adsp_mem>;

			linux,contiguous-region = <&secure_mem>;

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

		};

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

+3 −9
Original line number Diff line number Diff line
@@ -205,12 +205,6 @@ 
			label = "secure_mem";

		};



		adsp_mem: adsp_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x300000>;

			label = "adsp_mem";

		};



		qsecom_mem: qsecom_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x1800000>;
@@ -1662,7 +1656,7 @@ 
		reg = <0x00000000 0x00010000>;

		reg-names = "rfsa_dsp";

		qcom,client-id = <0x011013ec>;

		linux,contiguous-region = <&adsp_mem>;

		linux,contiguous-region = <&secure_mem>;

	};



	qcom,mdm_sharedmem@00000000 {
@@ -1677,7 +1671,7 @@ 
		reg = <0x00000000 0x00010000>;

		reg-names = "rfsa_sensor";

		qcom,client-id = <0x011013ee>;

		linux,contiguous-region = <&adsp_mem>;

		linux,contiguous-region = <&secure_mem>;

	};



	qcom,venus@fdce0000 {
@@ -2778,7 +2772,7 @@ 
	adsp_heap {

		compatible = "qcom,msm-shared-memory";

		qcom,proc-id = <1>;

		linux,contiguous-region = <&adsp_mem>;

		linux,contiguous-region = <&secure_mem>;

	};



	qcom,msm-ssc-sensors {