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

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

Merge "ARM: dts: msm: Add device trees for IDPS with AMOLED for Yupik and YupikP"

parents b50fb80c c7360074
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -156,10 +156,12 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \
	yupik-atp-overlay.dtbo \
	yupik-qrd-overlay.dtbo \
	yupik-idps-digital-mics-overlay.dtbo \
	yupik-idps-amoled-overlay.dtbo \
	yupikp-idp-overlay.dtbo \
	yupikp-atp-overlay.dtbo \
	yupikp-qrd-overlay.dtbo \
	yupikp-idps-digital-mics-overlay.dtbo
	yupikp-idps-digital-mics-overlay.dtbo \
	yupikp-idps-amoled-overlay.dtbo


yupik-rumi-overlay.dtbo-base := yupik.dtb
@@ -167,20 +169,24 @@ yupik-idp-overlay.dtbo-base := yupik.dtb
yupik-atp-overlay.dtbo-base := yupik.dtb
yupik-qrd-overlay.dtbo-base := yupik.dtb
yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb
yupik-idps-amoled-overlay.dtbo-base := yupik.dtb
yupikp-idp-overlay.dtbo-base := yupikp.dtb
yupikp-atp-overlay.dtbo-base := yupikp.dtb
yupikp-qrd-overlay.dtbo-base := yupikp.dtb
yupikp-idps-digital-mics-overlay.dtbo-base := yupikp.dtb
yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb
else
dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
	yupik-idp.dtb \
	yupik-atp.dtb \
	yupik-qrd.dtb \
	yupik-idps-digital-mics.dtb \
	yupik-idps-amoled.dtb \
	yupikp-idp.dtb \
	yupikp-atp.dtb \
	yupikp-qrd.dtb \
	yupikp-idps-digital-mics.dtb
	yupikp-idps-digital-mics.dtb \
	yupikp-idps-amoled.dtb
endif

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

#include "yupik-idps-amoled.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Yupik IDPS + AMOLED";
	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
	qcom,msm-id = <475 0x10000>;
	qcom,board-id = <34 2>;
};
+10 −0
Original line number Diff line number Diff line
/dts-v1/;

#include "yupik.dtsi"
#include "yupik-idps-amoled.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Yupik IDPS + AMOLED";
	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
	qcom,board-id = <34 2>;
};
+4 −0
Original line number Diff line number Diff line
#include "yupik-idp.dtsi"

&soc {
};
+11 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include "yupikp-idps-amoled.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. YupikP IDPS + AMOLED";
	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
	qcom,msm-id = <499 0x10000>;
	qcom,board-id = <34 2>;
};
Loading