From 6a20d70e1b27de90fac589701e48741b29b02a4d Mon Sep 17 00:00:00 2001 From: Naina Mehta Date: Thu, 2 Jun 2022 16:02:08 +0530 Subject: [PATCH] ARM: dts: msm: Include base parrot DT in dts Include base Parrot DT in dts files for compilation with overlay disabled. Change-Id: I580d6ece717472330a80e7c5178fcbab4d403085 --- qcom/parrot-atp.dts | 1 + qcom/parrot-idp-nopmi.dts | 1 + qcom/parrot-idp-wcn3990-amoled-rcm.dts | 1 + qcom/parrot-idp-wcn3990.dts | 1 + qcom/parrot-idp-wcn6750-amoled-rcm.dts | 1 + qcom/parrot-idp-wcn6750-amoled.dts | 1 + qcom/parrot-idp.dts | 1 + qcom/parrot-qrd-nopmi.dts | 1 + qcom/parrot-qrd-wcn6750-overlay.dts | 2 +- qcom/parrot-qrd-wcn6750.dts | 3 ++- qcom/parrot-qrd.dts | 1 + qcom/parrot-rumi.dts | 1 + qcom/parrot-vm-qrd-wcn6750.dts | 2 +- 13 files changed, 14 insertions(+), 3 deletions(-) diff --git a/qcom/parrot-atp.dts b/qcom/parrot-atp.dts index c4da0c47..ad4c3394 100644 --- a/qcom/parrot-atp.dts +++ b/qcom/parrot-atp.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-atp.dtsi" diff --git a/qcom/parrot-idp-nopmi.dts b/qcom/parrot-idp-nopmi.dts index 69f81317..e783320b 100644 --- a/qcom/parrot-idp-nopmi.dts +++ b/qcom/parrot-idp-nopmi.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn6750.dtsi" #include "parrot-idp.dtsi" diff --git a/qcom/parrot-idp-wcn3990-amoled-rcm.dts b/qcom/parrot-idp-wcn3990-amoled-rcm.dts index dbc3d4ec..6f231167 100644 --- a/qcom/parrot-idp-wcn3990-amoled-rcm.dts +++ b/qcom/parrot-idp-wcn3990-amoled-rcm.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-idp-wcn3990-amoled-rcm.dtsi" #include "parrot-idp-pm7250b.dtsi" diff --git a/qcom/parrot-idp-wcn3990.dts b/qcom/parrot-idp-wcn3990.dts index 49e474da..9fc31186 100644 --- a/qcom/parrot-idp-wcn3990.dts +++ b/qcom/parrot-idp-wcn3990.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-idp-wcn3990.dtsi" #include "parrot-idp-pm7250b.dtsi" diff --git a/qcom/parrot-idp-wcn6750-amoled-rcm.dts b/qcom/parrot-idp-wcn6750-amoled-rcm.dts index f0890e68..41501d70 100644 --- a/qcom/parrot-idp-wcn6750-amoled-rcm.dts +++ b/qcom/parrot-idp-wcn6750-amoled-rcm.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn6750.dtsi" #include "parrot-idp-wcn6750-amoled-rcm.dtsi" #include "parrot-idp-pm7250b.dtsi" diff --git a/qcom/parrot-idp-wcn6750-amoled.dts b/qcom/parrot-idp-wcn6750-amoled.dts index 7ea3df46..59177430 100644 --- a/qcom/parrot-idp-wcn6750-amoled.dts +++ b/qcom/parrot-idp-wcn6750-amoled.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn6750.dtsi" #include "parrot-idp-wcn6750-amoled.dtsi" #include "parrot-idp-pm7250b.dtsi" diff --git a/qcom/parrot-idp.dts b/qcom/parrot-idp.dts index 7bb4e002..5969cc30 100644 --- a/qcom/parrot-idp.dts +++ b/qcom/parrot-idp.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn6750.dtsi" #include "parrot-idp.dtsi" #include "parrot-idp-pm7250b.dtsi" diff --git a/qcom/parrot-qrd-nopmi.dts b/qcom/parrot-qrd-nopmi.dts index ee968e5b..3a55297b 100644 --- a/qcom/parrot-qrd-nopmi.dts +++ b/qcom/parrot-qrd-nopmi.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-qrd.dtsi" diff --git a/qcom/parrot-qrd-wcn6750-overlay.dts b/qcom/parrot-qrd-wcn6750-overlay.dts index 488e0749..d4531813 100644 --- a/qcom/parrot-qrd-wcn6750-overlay.dts +++ b/qcom/parrot-qrd-wcn6750-overlay.dts @@ -6,7 +6,7 @@ #include "parrot-qrd-pm7250b.dtsi" / { - model = "Qualcomm Technologies, Inc. Parrot QRD"; + model = "Qualcomm Technologies, Inc. Parrot WCN6750 QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,msm-id = <537 0x10000>; qcom,board-id = <0x1000B 1>; diff --git a/qcom/parrot-qrd-wcn6750.dts b/qcom/parrot-qrd-wcn6750.dts index f11c362b..8d4b3e09 100644 --- a/qcom/parrot-qrd-wcn6750.dts +++ b/qcom/parrot-qrd-wcn6750.dts @@ -1,11 +1,12 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn6750.dtsi" #include "parrot-qrd-wcn6750.dtsi" #include "parrot-qrd-pm7250b.dtsi" / { - model = "Qualcomm Technologies, Inc. Parrot QRD"; + model = "Qualcomm Technologies, Inc. Parrot WCN6750 QRD"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,board-id = <0x1000B 1>; }; diff --git a/qcom/parrot-qrd.dts b/qcom/parrot-qrd.dts index 0a0c61af..4aa019b6 100644 --- a/qcom/parrot-qrd.dts +++ b/qcom/parrot-qrd.dts @@ -1,5 +1,6 @@ /dts-v1/; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-qrd.dtsi" #include "parrot-qrd-pm7250b.dtsi" diff --git a/qcom/parrot-rumi.dts b/qcom/parrot-rumi.dts index 0498e836..446c4515 100644 --- a/qcom/parrot-rumi.dts +++ b/qcom/parrot-rumi.dts @@ -1,6 +1,7 @@ /dts-v1/; /memreserve/ 0x90000000 0x00010000; +#include "parrot.dtsi" #include "parrot-wcn3990.dtsi" #include "parrot-rumi.dtsi" diff --git a/qcom/parrot-vm-qrd-wcn6750.dts b/qcom/parrot-vm-qrd-wcn6750.dts index df0ba762..35474550 100644 --- a/qcom/parrot-vm-qrd-wcn6750.dts +++ b/qcom/parrot-vm-qrd-wcn6750.dts @@ -4,7 +4,7 @@ #include "parrot-vm-qrd-wcn6750.dtsi" / { - model = "Qualcomm Technologies, Inc. Parrot SVM QRD"; + model = "Qualcomm Technologies, Inc. Parrot SVM QRD + WCN6750"; compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; qcom,board-id = <0x1000B 1>; };