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

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

Merge "ARM: dts: msm: Add support for Lahaina ATP platform"

parents 66378290 56b00838

bindings/arm/msm/msm.txt

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ compatible = "qcom,kona-mtp" 
compatible = "qcom,kona-cdp"

compatible = "qcom,kona-qrd"

compatible = "qcom,lahaina-rumi"

compatible = "qcom,lahaina-atp"

compatible = "qcom,lahaina-mtp"

compatible = "qcom,lahaina-cdp"

compatible = "qcom,lahaina-qrd"
@@ -196,6 +197,7 @@ compatible = "qcom,lahaina-qrd-module" 
compatible = "qcom,shima-rumi"

compatible = "qcom,lahainap-mtp"

compatible = "qcom,lahainap-cdp"

compatible = "qcom,lahainap-atp"

compatible = "qcom,lahainap-qrd"

compatible = "qcom,lito-rumi"

compatible = "qcom,lito-mtp"

qcom/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -5,38 +5,46 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ 
	lahaina-mtp-hsp-overlay.dtbo \

	lahaina-cdp-overlay.dtbo \

	lahaina-qrd-overlay.dtbo \

	lahaina-atp-overlay.dtbo \

	lahaina-qrd-hsp-overlay.dtbo \

	lahaina-qrd-module-overlay.dtbo \

	lahainap-mtp-overlay.dtbo \

	lahainap-cdp-overlay.dtbo \

	lahainap-atp-overlay.dtbo \

	lahainap-qrd-overlay.dtbo



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

lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb

lahaina-mtp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb

lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb

lahaina-atp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb

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

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

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

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

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

lahainap-atp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb

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

else

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

	lahaina-mtp-hsp.dtb \

	lahaina-mtp.dtb \

	lahaina-cdp.dtb \

	lahaina-atp.dtb \

	lahaina-qrd-hsp.dtb \

	lahaina-qrd.dtb \

	lahaina-qrd-module.dtb \

	lahainap-mtp.dtb \

	lahainap-cdp.dtb \

	lahainap-atp.dtb \

	lahainap-qrd.dtb \

	lahaina-v2-mtp.dtb \

	lahaina-v2-cdp.dtb \

	lahaina-v2-atp.dtb \

	lahaina-v2-qrd.dtb \

	lahainap-v2-mtp.dtb \

	lahainap-v2-cdp.dtb \

	lahainap-v2-atp.dtb \

	lahainap-v2-qrd.dtb

endif

qcom/lahaina-atp-overlay.dts

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

/plugin/;



#include "lahaina-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina ATP";

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

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

};

qcom/lahaina-atp.dts

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



#include "lahaina.dtsi"

#include "lahaina-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina ATP";

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

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

};

qcom/lahaina-atp.dtsi

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