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

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

Merge "ARM: dts: msm: Add device tree variants for Monaco"

parents 75b9e23e 8be455bb

bindings/arm/msm/msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ SoCs: 
- MONACO

  compatible = "qcom,monaco"



- MONACOP

  compatible = "qcom,monacop"



- SDXNIGHTJAR

  compatible = "qcom,sdxnightjar"
@@ -291,6 +294,8 @@ compatible = "qcom,holi-atp" 
compatible = "qcom,blair-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,monaco-rumi"

compatible = "qcom,monaco"

compatible = "qcom,monacop"

compatible = "qcom,sdxnightjar-mtp"

compatible = "qcom,sdxnightjar-cdp"

compatible = "qcom,sdxnightjar-qrd"

qcom/Makefile

+22 −2
Original line number Diff line number Diff line
@@ -220,11 +220,31 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

dtbo-$(CONFIG_ARCH_MONACO) +=    \

	monaco-rumi-overlay.dtbo

	monaco-rumi-overlay.dtbo \

	monaco-standalone-idp-v1-overlay.dtbo \

	monaco-standalone-idp-v2-overlay.dtbo \

	monaco-standalone-idp-v3-overlay.dtbo \

	monaco-idp-v1-verlay.dtbo \

	monaco-idp-v2-overlay.dtbo \

	monaco-idp-v3-overlay.dtbo



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

monaco-standalone-idp-v1-overlay.dtbo-base := monaco.dtb

monaco-standalone-idp-v2-overlay.dtbo-base := monaco.dtb

monaco-standalone-idp-v3-overlay.dtbo-base := monaco.dtb

monaco-idp-v1-overlay.dtbo-base := monaco.dtb monacop.dtb

monaco-idp-v2-overlay.dtbo-base := monaco.dtb

monaco-idp-v3-overlay.dtbo-base := monaco.dtb



else

dtb-$(CONFIG_ARCH_MONACO) += monaco-rumi.dtb

dtb-$(CONFIG_ARCH_MONACO) += monaco-rumi.dtb \

	monaco-standalone-idp-v1.dtb \

	monaco-standalone-idp-v2.dtb \

	monaco-standalone-idp-v3.dtb \

	monaco-idp-v1.dtb \

	monaco-idp-v2.dtb \

	monaco-idp-v3.dtb \

	monacop-idp-v1.dtb

endif



dtb-$(CONFIG_ARCH_SCUBA) += qrb2210-rb1.dtb

qcom/monaco-idp-v1-overlay.dts

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

/plugin/;



#include "monaco-idp-v1.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Monaco IDP V1.0";

	qcom,board-id = <0x010022 0x0>;

};

qcom/monaco-idp-v1.dts

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



#include "monaco.dtsi"

#include "monaco-idp-v1.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Monaco IDP V1.0";

	compatible = "qcom,monaco", "qcom,idp";

	qcom,board-id = <0x010022 0x0>;

};

qcom/monaco-idp-v1.dtsi

0 → 100644
+0 −0

Empty file added.