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

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

Merge "ARM: dts: msm: Add initial platform device tree for blair"

parents 58b7f62f 6ff399ba

bindings/arm/msm/msm.txt

+3 −0
Original line number Diff line number Diff line
@@ -292,6 +292,9 @@ compatible = "qcom,holi-cdp" 
compatible = "qcom,holi-qrd"

compatible = "qcom,holi-atp"

compatible = "qcom,blair-rumi"

compatible = "qcom,blair-mtp"

compatible = "qcom,blair-cdp"

compatible = "qcom,blair-atp"

compatible = "qcom,scuba-idp"

compatible = "qcom,monaco-rumi"

compatible = "qcom,monaco"

qcom/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -120,11 +120,21 @@ dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \ 
endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

dtbo-$(CONFIG_ARCH_BLAIR) += blair-rumi-overlay.dtbo

dtbo-$(CONFIG_ARCH_BLAIR) += blair-rumi-overlay.dtbo \

	blair-mtp-overlay.dtbo \

	blair-cdp-overlay.dtbo \

	blair-atp-overlay.dtbo



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

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

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

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



else

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

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

	blair-mtp.dtb \

	blair-cdp.dtb \

	blair-atp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/blair-atp-overlay.dts

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



#include "blair.dtsi"

#include "blair-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair ATP";

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

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

	qcom,board-id = <33 0>;

};

qcom/blair-atp.dts

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



#include "blair.dtsi"

#include "blair-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair ATP";

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

	qcom,board-id = <33 0>;

};

qcom/blair-atp.dtsi

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

};