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

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

Merge "ARM: dts: msm: Add device trees for LahainaP variant"

parents 8945e18f 295665f6

bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ SoCs: 
- LAHAINA

  compatible = "qcom,lahaina"



- LAHAINAP

  compatible = "qcom,lahainap"



- SHIMA

  compatible = "qcom,shima"
@@ -185,6 +188,9 @@ compatible = "qcom,lahaina-cdp" 
compatible = "qcom,lahaina-qrd"

compatible = "qcom,lahaina-qrd-module"

compatible = "qcom,shima-rumi"

compatible = "qcom,lahainap-mtp"

compatible = "qcom,lahainap-cdp"

compatible = "qcom,lahainap-qrd"

compatible = "qcom,lito-rumi"

compatible = "qcom,lito-mtp"

compatible = "qcom,lito-cdp"

qcom/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ 
	lahaina-cdp-overlay.dtbo \

	lahaina-qrd-overlay.dtbo \

	lahaina-qrd-hsp-overlay.dtbo \

	lahaina-qrd-module-overlay.dtbo

	lahaina-qrd-module-overlay.dtbo \

	lahainap-mtp-overlay.dtbo \

	lahainap-cdp-overlay.dtbo \

	lahainap-qrd-overlay.dtbo



lahaina-rumi-overlay.dtbo-base := lahaina.dtb

lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb
@@ -14,6 +17,9 @@ lahaina-cdp-overlay.dtbo-base := lahaina.dtb 
lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb

lahaina-qrd-overlay.dtbo-base := lahaina.dtb

lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb

lahainap-mtp-overlay.dtbo-base := lahainap.dtb

lahainap-cdp-overlay.dtbo-base := lahainap.dtb

lahainap-qrd-overlay.dtbo-base := lahainap.dtb

else

dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \

	lahaina-mtp-hsp.dtb \
@@ -21,7 +27,10 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ 
	lahaina-cdp.dtb \

	lahaina-qrd-hsp.dtb \

	lahaina-qrd.dtb \

	lahaina-qrd-module.dtb

	lahaina-qrd-module.dtb \

	lahainap-mtp.dtb \

	lahainap-cdp.dtb \

	lahainap-qrd.dtb

endif



dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb

qcom/lahainap-cdp-overlay.dts

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

/plugin/;



#include "lahainap-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. LahainaP CDP";

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

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

};

qcom/lahainap-cdp.dts

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



#include "lahainap.dtsi"

#include "lahainap-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. LahainaP CDP";

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

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

};

qcom/lahainap-cdp.dtsi

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