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

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

Merge "ARM: dts: msm: Add support for Lahaina HSP Pro"

parents bcd55c9c 4c70eeaa

qcom/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ 
	lahainap-qrd-overlay.dtbo \

	lahaina-cdp-v2.2-overlay.dtbo \

	lahaina-mtp-v2-overlay.dtbo \

	lahaina-mtp-v2.1-overlay.dtbo

	lahaina-mtp-v2.1-overlay.dtbo \

	lahaina-mtp-hsp-pro-overlay.dtbo \

	lahaina-cdp-hsp-pro-overlay.dtbo \

	lahaina-qrd-hsp-pro-overlay.dtbo



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

lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb
@@ -38,6 +41,12 @@ lahaina-mtp-v2-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \ 
					lahaina-v2.1.dtb

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

					lahaina-v2.1.dtb

lahaina-mtp-hsp-pro-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \

					lahaina-v2.1.dtb

lahaina-cdp-hsp-pro-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \

					lahaina-v2.1.dtb

lahaina-qrd-hsp-pro-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \

					lahaina-v2.1.dtb

else

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

	lahaina-mtp-hsp.dtb \
@@ -75,7 +84,10 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ 
	lahainap-v2.1-atp.dtb \

	lahainap-v2.1-qrd.dtb \

	lahaina-mtp-v2.dtb \

	lahaina-mtp-v2.1.dtb

	lahaina-mtp-v2.1.dtb \

	lahaina-v2.1-mtp-hsp-pro.dts \

	lahaina-v2.1-cdp-hsp-pro.dts \

	lahaina-v2.1-qrd-hsp-pro.dts

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/lahaina-cdp-hsp-pro-overlay.dts

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

/plugin/;



#include "lahaina-cdp-hsp-pro.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina CDP-HSP-PRO";

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

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

};

qcom/lahaina-cdp-hsp-pro.dtsi

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

qcom/lahaina-mtp-hsp-pro-overlay.dts

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

/plugin/;



#include "lahaina-mtp-hsp-pro.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Lahaina MTP-HSP-PRO";

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

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

};

qcom/lahaina-mtp-hsp-pro.dtsi

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