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

Commit bd4d45f1 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: Add memory map for 512MB msm8916 platforms"

parents 15ccc9bc e58c5abe

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

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@25 {

			reg = <25>;

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

		};



		qcom,ion-heap@21 {

			reg = <21>;

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

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

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

			reg = <27>;

			linux,contiguous-region = <&venus_qseecom_mem>;

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

		};



		qcom,ion-heap@28 { /* AUDIO HEAP */

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

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

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

		};



		qcom,ion-heap@23 { /* OTHER PIL HEAP */

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

			reg = <23>;

			linux,contiguous-region = <&peripheral_mem>;

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

		};



		qcom,ion-heap@26 { /* MODEM HEAP */

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

			reg = <26>;

			linux,contiguous-region = <&modem_adsp_mem>;

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

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-512mb-memory.dtsi

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "msm8916-512mb-ion.dtsi"



/ {

	memory {

		#address-cells = <2>;

		#size-cells = <2>;



		external_image_mem: external_image__region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

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

			label = "external_image_mem";

		};



		modem_adsp_mem: modem_adsp_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

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

			label = "modem_adsp_mem";

		};



		peripheral_mem: pheripheral_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

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

			label = "peripheral_mem";

		};



		venus_qseecom_mem: venus_qseecom_region@0 {

			linux,reserve-contiguous-region;

			linux,memory-limit = <0x90000000>;

			reg = <0 0 0 0x600000>;

			label = "venus_qseecom_mem";

		};



		audio_mem: audio_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x314000>;

			label = "audio_mem";

		};



		cont_splash_mem: splash_region@83000000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

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

			label = "cont_splash_mem";

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-512mb-mtp-smb1360.dts

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
/dts-v1/;



#include "msm8916-mtp.dtsi"

#include "msm8916-512mb-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8916 512MB SMB1360 MTP";

arch/arm/boot/dts/qcom/msm8916-512mb-mtp.dts

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
/dts-v1/;



#include "msm8916-mtp.dtsi"

#include "msm8916-512mb-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8916 512MB MTP";

arch/arm/boot/dts/qcom/msm8916-512mb-qrd-skuh.dts

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
/dts-v1/;



#include "msm8916-qrd-skuh.dtsi"

#include "msm8916-512mb-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8916 512MB QRD SKUH";