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

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

Merge "ARM: dts: msm: Add DT support for nopmi on Blair target"

parents 6489f0bf dc01e295

qcom/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ dtbo-$(CONFIG_ARCH_BLAIR) += blair-rumi-overlay.dtbo \ 
	blair-cdp-overlay.dtbo \

	blair-atp-overlay.dtbo \

	blair-qrd-overlay.dtbo \

	blair-mtp-usbc-overlay.dtbo

	blair-mtp-usbc-overlay.dtbo \

	blair-mtp-nopmi-overlay.dtbo \

	blair-qrd-nopmi-overlay.dtbo



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

blair-mtp-overlay.dtbo-base := blair.dtb
@@ -153,13 +155,17 @@ blair-cdp-overlay.dtbo-base := blair.dtb 
blair-atp-overlay.dtbo-base := blair.dtb

blair-qrd-overlay.dtbo-base := blair.dtb

blair-mtp-usbc-overlay.dtbo-base := blair.dtb

blair-mtp-nopmi-overlay.dtbo-base := blair.dtb

blair-qrd-nopmi-overlay.dtbo-base := blair.dtb

else

dtb-$(CONFIG_ARCH_BLAIR) += blair-rumi.dtb \

	blair-mtp.dtb \

	blair-cdp.dtb \

	blair-atp.dtb \

	blair-qrd.dtb \

	blair-mtp-usbc.dtb

	blair-mtp-usbc.dtb \

	blair-mtp-nopmi.dtb \

	blair-qrd-nopmi.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/blair-mtp-nopmi-overlay.dts

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

/plugin/;



#include "blair-mtp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair MTP NOPMI";

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

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

	qcom,board-id = <8 0>;

};

qcom/blair-mtp-nopmi.dts

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



#include "blair.dtsi"

#include "blair-mtp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair MTP NOPMI";

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

	qcom,board-id = <8 0>;

};

qcom/blair-mtp-nopmi.dtsi

0 → 100644
+2 −0
Original line number Diff line number Diff line 
/ {

};

qcom/blair-qrd-nopmi-overlay.dts

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

/plugin/;



#include "blair-qrd-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair QRD NOPMI";

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

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

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

};