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

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

Merge "ARM: dts: msm: Add initial device tree for Scuba APQ"

parents 1a842abf 619b2c84

qcom/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -146,17 +146,18 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		scuba-qrd-eldo-overlay.dtbo \

		scuba-qrd-non-eldo-overlay.dtbo



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

scuba-idp-overlay.dtbo-base := scuba.dtb

scuba-qrd-eldo-overlay.dtbo-base := scuba.dtb

scuba-qrd-non-eldo-overlay.dtbo-base := scuba.dtb

scuba-idp-usbc-overlay.dtbo-base := scuba.dtb

scuba-rumi-overlay.dtbo-base := scuba.dtb scubap.dtb

scuba-idp-overlay.dtbo-base := scuba.dtb scubap.dtb

scuba-qrd-eldo-overlay.dtbo-base := scuba.dtb scubap.dtb

scuba-qrd-non-eldo-overlay.dtbo-base := scuba.dtb scubap.dtb

scuba-idp-usbc-overlay.dtbo-base := scuba.dtb scubap.dtb

else

dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \

	scuba-idp.dtb \

	scuba-idp-usbc.dtb \

	scuba-qrd-eldo.dtb \

	scuba-qrd-non-eldo.dtb

	scuba-qrd-non-eldo.dtb \

	scubap-idp.dtb

endif



always		:= $(dtb-y)

qcom/scuba-idp-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Scuba IDP";

	compatible = "qcom,scuba-idp", "qcom,scuba", "qcom,idp";

	qcom,msm-id = <441 0x10000>;

	qcom,msm-id = <441 0x10000>, <471 0x10000>;

	qcom,board-id = <34 0>;

};

qcom/scuba-qrd-eldo-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Scuba QRD ELDO";

	compatible = "qcom,scuba-qrd", "qcom,scuba", "qcom,qrd";

	qcom,msm-id = <441 0x10000>;

	qcom,msm-id = <441 0x10000>, <471 0x10000>;

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

};

qcom/scuba-qrd-non-eldo-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Scuba QRD NON ELDO";

	compatible = "qcom,scuba-qrd", "qcom,scuba", "qcom,qrd";

	qcom,msm-id = <441 0x10000>;

	qcom,msm-id = <441 0x10000>, <471 0x10000>;

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

};

qcom/scubap-idp.dts

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



#include "scuba.dtsi"

#include "scuba-idp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Scubap IDP";

	compatible = "qcom,scuba-idp", "qcom,scuba", "qcom,idp";

	qcom,msm-id = <471 0x10000>;

	qcom,board-id = <34 0>;

};