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

Commit 0c422ca4 authored by vagdhan kumar kanukurthi's avatar vagdhan kumar kanukurthi
Browse files

ARM: dts: msm: Add model specific configurations for SA6155 VMs 



Add support to specify device configurations for individual virtual
machine models as the device configurations differ between virtual
machine models. This applies to virtual machine models based on the
SA6155 platform.

Change-Id: I6bc4c11013a050e9dbae3d8284b712bff96e3d8e
Signed-off-by: default avatarVagdhan Kanukurthi <vagdhank@codeaurora.org>
parent 81e1f886

arch/arm64/boot/dts/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ dtb-$(CONFIG_QTI_GVM) += sa8155-vm-la.dtb \ 
	sa8155-vm-lv.dtb \

	sa8155-vm-lv-mt.dtb \

	sa8155-vm-la-mt.dtb \

	sa6155p-vm.dtb \

	sa6155p-vm-la.dtb \

	sa8195-vm-la.dtb \

	sa8195-vm-la-mt.dtb \

	sa8195-vm-lv.dtb \

arch/arm64/boot/dts/qcom/sa6155p-vm.dts→arch/arm64/boot/dts/qcom/sa6155p-vm-la.dts

+2 −35
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, 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
@@ -13,7 +13,7 @@ 


/dts-v1/;



#include "sa6155p-vm.dtsi"

#include "sa6155p-vm-la.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P Virtual Machine";
@@ -21,36 +21,3 @@ 
	qcom,pmic-name = "PM6150";

	qcom,board-id = <0 0>;

};
 


&slpi_tlmm {

	status = "ok";

};



&apps_smmu {

	status = "ok";

};



&qupv3_se7_4uart {

	status = "ok";

};



&usb0 {

	status = "ok";

};



&qusb_phy0 {

	status = "ok";

};



&pcie0_msi {

	status = "ok";

};



&pcie0 {

	status = "ok";

};



&sdhc_2 {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa6155p-vm-la.dtsi

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019-2020, 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 "sa6155p-vm.dtsi"



/ {

	reserved_memory: reserved-memory {



		pmem_shared: pmem_shared_region@a1600000 {

			reg = <0x0 0xa1600000 0x0 0x20000000>;

			label = "pmem_shared_mem";

		};



		secure_display_memory: secure_display_region {

			compatible = "shared-dma-pool";

			reusable;

			reg = <0x0 0xc1800000 0x0 0x14000000>;

		};

	};

};



&slpi_tlmm {

	status = "ok";

};



&apps_smmu {

	status = "ok";

};



&qupv3_se7_4uart {

	status = "ok";

};



&usb0 {

	status = "ok";

};



&qusb_phy0 {

	status = "ok";

};



&pcie0_msi {

	status = "ok";

};



&pcie0 {

	status = "ok";

};



&sdhc_2 {

	status = "ok";

};



&msm_ion {

	qcom,ion-heap@10 {

		reg = <10>;

		memory-region = <&secure_display_memory>;

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

	};

};

arch/arm64/boot/dts/qcom/sa6155p-vm.dtsi

+0 −21
Original line number Diff line number Diff line
@@ -31,19 +31,6 @@ 
		sdhc2 = &sdhc_2; /* SDC2 SD Card slot */

	};



	reserved_memory: reserved-memory {



		pmem_shared: pmem_shared_region@a1600000 {

			reg = <0x0 0xa1600000 0x0 0x20000000>;

			label = "pmem_shared_mem";

		};



		secure_display_memory: secure_display_region {

			compatible = "shared-dma-pool";

			reusable;

			reg = <0x0 0xc1800000 0x0 0x14000000>;

		};

	};

};



&soc {
@@ -776,11 +763,3 @@ 
	dirconn-list =  <100 216 1>,

			<99 215 1>;

};
 


&msm_ion {

	qcom,ion-heap@10 {

		reg = <10>;

		memory-region = <&secure_display_memory>;

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

	};

};