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

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

Merge "ARM: dts: msm: Add Shima trustedVM device configuration"

parents d816a87c df6d247b

qcom/Makefile

+12 −1
Original line number Diff line number Diff line
@@ -141,7 +141,9 @@ endif 


ifeq ($(CONFIG_ARCH_LAHAINA), y)

ifeq ($(CONFIG_ARCH_QTI_VM), y)

dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb

dtb-$(CONFIG_ARCH_QTI_VM) += lahaina-vm-mtp.dtb \

	lahaina-vm-cdp.dtb \

	lahaina-vm-qrd.dtb

endif

endif
@@ -149,6 +151,15 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-cdp.dtb \

	sdxlemur-mtp.dtb



ifeq ($(CONFIG_ARCH_SHIMA), y)

ifeq ($(CONFIG_ARCH_QTI_VM), y)

dtb-$(CONFIG_ARCH_QTI_VM) += shima-vm-rumi.dtb \

	shima-vm-atp.dtb \

	shima-vm-idp.dtb \

	shima-vm-qrd.dtb

endif

endif



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb *.dtbo

qcom/lahaina-vm-cdp.dts

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "lahaina-vm.dtsi"

#include "lahaina-vm-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina SVM CDP";

	compatible = "qcom,lahaina-cdp", "qcom,lahaina", "qcom,cdp";

	qcom,board-id = <0x10001 0>;

};

qcom/lahaina-vm-cdp.dtsi

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/*#include "display/lahaina-sde-display-cdp.dtsi"*/

qcom/trustedvm-ion.dtsi→qcom/lahaina-vm-ion.dtsi

+0 −0

File moved.

View file

qcom/lahaina-vm-mtp.dts

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "lahaina-vm.dtsi"

#include "lahaina-vm-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina SVM MTP";

	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";

	qcom,board-id = <0x10008 0>;

};