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

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

Merge "ARM: dts: msm: Add device tree for Shima for IDPS with digital mics"

parents 6e226172 0e910bd2
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -99,17 +99,20 @@ dtbo-$(CONFIG_ARCH_SHIMA) += \
	shima-rumi-overlay.dtbo \
	shima-idp-overlay.dtbo	\
	shima-atp-overlay.dtbo \
	shima-qrd-overlay.dtbo
	shima-qrd-overlay.dtbo \
	shima-idps-digital-mics-overlay.dtbo

shima-rumi-overlay.dtbo-base := shima.dtb
shima-idp-overlay.dtbo-base := shima.dtb
shima-atp-overlay.dtbo-base := shima.dtb
shima-qrd-overlay.dtbo-base := shima.dtb
shima-idps-digital-mics-overlay.dtbo-base := shima.dtb
else
dtb-$(CONFIG_ARCH_SHIMA) += shima-rumi.dtb  \
			    shima-idp.dtb   \
			    shima-atp.dtb \
			    shima-qrd.dtb
			    shima-qrd.dtb \
			    shima-idps-digital-mics.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+11 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include "shima-idps-digital-mics.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Shima IDPS + DIGITAL MICS";
	compatible = "qcom,shima-idp", "qcom,shima", "qcom,idp";
	qcom,msm-id = <450 0x10000>;
	qcom,board-id = <34 1>;
};
+10 −0
Original line number Diff line number Diff line
/dts-v1/;

#include "shima.dtsi"
#include "shima-idps-digital-mics.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Shima IDPS + DIGITAL MICS";
	compatible = "qcom,shima-idp", "qcom,shima", "qcom,idp";
	qcom,board-id = <34 1>;
};
+2 −0
Original line number Diff line number Diff line
&soc {
};