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

Commit 82d6eaf2 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: Align memory map of msm8916 to latest version"

parents e6a023b4 7001f89e

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
		qcom,ion-heap@27 { /* QSEECOM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <27>;

			linux,contiguous-region = <&qseecom_mem>;

			linux,contiguous-region = <&venus_qseecom_mem>;

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

		};

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

+8 −13
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x8e200000 0x0 0x0900000>;

			reg = <0x0 0x86000000 0x0 0x0800000>;

			label = "external_image_mem";

		};
@@ -105,7 +105,7 @@ 
			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x88800000 0x0 0x05a00000>;

			reg = <0x0 0x86800000 0x0 0x04e00000>;

			label = "modem_adsp_mem";

		};
@@ -113,26 +113,21 @@ 
			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x8eb00000 0x0 0x0600000>;

			reg = <0x0 0x8b600000 0x0 0x0600000>;

			label = "peripheral_mem";

		};



		venus_mem: venus_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0x8f100000 0 0x0500000>;

			label = "venus_mem";

		};



		secure_mem: secure_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x6D00000>;

			label = "secure_mem";

		};



		qseecom_mem: qseecom_region@0 {

		venus_qseecom_mem: venus_qseecom_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0xd00000>;

			label = "qseecom_mem";

			linux,memory-limit = <0x90000000>;

			reg = <0 0 0 0x1200000>;

			label = "venus_qseecom_mem";

		};



		audio_mem: audio_region@0 {
@@ -1554,7 +1549,7 @@ 
		qcom,pas-id = <9>;

		qcom,proxy-timeout-ms = <5000>;

		qcom,firmware-name = "venus";

		linux,contiguous-region = <&venus_mem>;

		linux,contiguous-region = <&venus_qseecom_mem>;

	};



	qcom,msm-thermal {