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

Commit aaf8550d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add model specific configurations for SA8155 VMs"

parents 32e310dc d5f627e1

arch/arm64/boot/dts/qcom/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150p-hdk.dtb

	sm8150p-hdk.dtb

endif

endif





dtb-$(CONFIG_QTI_GVM) += sa8155-vm.dtb \

dtb-$(CONFIG_QTI_GVM) += sa8155-vm-la.dtb \

	sa8155-vm-lv.dtb \

	sa8155-vm-lv.dtb \

	sa8155-vm-lv-mt.dtb \

	sa8155-vm-lv-mt.dtb \

	sa8155-vm-la-mt.dtb \

	sa8155-vm-la-mt.dtb \

arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dts

+2 −9
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -13,6 +13,7 @@ 
/dts-v1/;

/dts-v1/;





#include "sa8155-vm.dtsi"

#include "sa8155-vm.dtsi"

#include "sa8155-vm-la-mt.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. SA8155 Virtual Machine";

	model = "Qualcomm Technologies, Inc. SA8155 Virtual Machine";
@@ -20,11 +21,3 @@ 
	qcom,pmic-name = "PM8150";

	qcom,pmic-name = "PM8150";

	qcom,board-id = <0 0>;

	qcom,board-id = <0 0>;

};
 
};
 


&slpi_tlmm {

	status = "ok";

};



&apps_smmu {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dtsi

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

 * Copyright (c) 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.

 */



/ {

	reserved_memory: reserved-memory {



		pmem_shared: pmem_shared_region@a0000000 {

			reg = <0x1 0x2c200000 0x0 0x53e00000>;

			label = "pmem_shared_mem";

		};

	};

};



&slpi_tlmm {

	status = "ok";

};



&apps_smmu {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa8155-vm-la.dts

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

 * Copyright (c) 2018-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.

 */



/dts-v1/;



#include "sa8155-vm.dtsi"

#include "sa8155-vm-la.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8155 Virtual Machine";

	compatible = "qcom,sa8155";

	qcom,pmic-name = "PM8150";

	qcom,board-id = <0 0>;

};

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

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

 * Copyright (c) 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.

 */



/ {

	reserved_memory: reserved-memory {



		pmem_shared: pmem_shared_region@a0000000 {

			reg = <0x1 0x6a500000 0x0 0x51400000>;

			label = "pmem_shared_mem";

		};



		secure_display_memory: secure_display_region { /* Secure UI */

			compatible = "shared-dma-pool";

			reusable;

			reg = <0x0 0xc0000000 0x0 0x14400000>;

		};

	};

};



&slpi_tlmm {

	status = "ok";

};



&apps_smmu {

	status = "ok";

};



&qupv3_se13_4uart {

	status = "ok";

};



&usb0 {

	status = "ok";

};



&usb2_phy0 {

	status = "ok";

};



&pcie0_msi {

	status = "ok";

};



&pcie0 {

	status = "ok";

};



&sdhc_2 {

	status = "ok";

};



&msm_ion {

	qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

		reg = <10>;

		memory-region = <&secure_display_memory>;

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

	};

};