From 3ff57e6d335861a5f5e4c3686bbd319d9d49b6f2 Mon Sep 17 00:00:00 2001 From: Melody Olvera Date: Fri, 10 Sep 2021 16:00:26 -0700 Subject: [PATCH] ARM: dts: msm: Revise V2 dts and add sdxlemur lite soc id Revise the V2 dts files to match V1 CDTs and add sdxlemur lite soc id to the V2 dtsi file. Change-Id: I4af8330b83be34defa51523800e8b0ebc0925d76 --- qcom/sdxlemur-v2-cdp.dts | 2 +- qcom/sdxlemur-v2-mtp-cpe.dts | 3 ++- qcom/sdxlemur-v2-mtp-mbb-emmc.dts | 2 +- qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts | 2 +- qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts | 2 +- qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts | 2 +- qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts | 2 +- qcom/sdxlemur-v2-mtp-mbb.dts | 3 ++- qcom/sdxlemur-v2-mtp.dts | 2 +- qcom/sdxlemur-v2-rcm-pcie-ep.dts | 2 +- qcom/sdxlemur-v2-rcm-rc.dts | 2 +- qcom/sdxlemur-v2.dtsi | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/qcom/sdxlemur-v2-cdp.dts b/qcom/sdxlemur-v2-cdp.dts index 769730839959..60d4fd8b30c7 100644 --- a/qcom/sdxlemur-v2-cdp.dts +++ b/qcom/sdxlemur-v2-cdp.dts @@ -11,5 +11,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR CDP V2"; compatible = "qcom,sdxlemur-cdp", "qcom,sdxlemur", "qcom,cdp"; - qcom,board-id = <0x20001 0x300>; + qcom,board-id = <0x01 0x300>; }; diff --git a/qcom/sdxlemur-v2-mtp-cpe.dts b/qcom/sdxlemur-v2-mtp-cpe.dts index f8670b646394..ac9e17a8d7f6 100644 --- a/qcom/sdxlemur-v2-mtp-cpe.dts +++ b/qcom/sdxlemur-v2-mtp-cpe.dts @@ -2,6 +2,7 @@ #include "sdxlemur-v2.dtsi" #include "sdxlemur-mtp-cpe.dtsi" +#include "sdxlemur-mtp-cpe-hsp.dtsi" #include "sdxlemur-1024mb-cpe.dtsi" #include "sdxlemur-audio.dtsi" #include "sdxlemur-mtp-audio-overlay.dtsi" @@ -10,5 +11,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x6020008 0x306>; + qcom,board-id = <0x6010008 0x306>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb-emmc.dts b/qcom/sdxlemur-v2-mtp-mbb-emmc.dts index 633ca94dcd73..447854dcbb5d 100644 --- a/qcom/sdxlemur-v2-mtp-mbb-emmc.dts +++ b/qcom/sdxlemur-v2-mtp-mbb-emmc.dts @@ -11,5 +11,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB eMMC V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x2020108 0x302>; + qcom,board-id = <0x2010108 0x302>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts b/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts index 65630ea06a58..463b234bbb4a 100644 --- a/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts +++ b/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts @@ -10,5 +10,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB NTN3 PCIE V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x5020008 0x305>; + qcom,board-id = <0x5010008 0x305>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts b/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts index e638af1217be..eed8f4538c10 100644 --- a/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts +++ b/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts @@ -8,5 +8,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB PCIE-EP V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0xB020008 0x20B>; + qcom,board-id = <0xB010008 0x20B>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts b/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts index 77326071dd86..7c113e5da418 100644 --- a/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts +++ b/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts @@ -8,5 +8,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB PCIE-EP V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x4020008 0x204>; + qcom,board-id = <0x4010008 0x204>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts b/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts index c5956de09f13..f0d1d2a65218 100644 --- a/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts +++ b/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts @@ -8,5 +8,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB RC PCIE-EP V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x3020008 0x203>; + qcom,board-id = <0x3010008 0x203>; }; diff --git a/qcom/sdxlemur-v2-mtp-mbb.dts b/qcom/sdxlemur-v2-mtp-mbb.dts index 0dc789e85177..275d5b25f80a 100644 --- a/qcom/sdxlemur-v2-mtp-mbb.dts +++ b/qcom/sdxlemur-v2-mtp-mbb.dts @@ -6,10 +6,11 @@ #include "sdxlemur-audio.dtsi" #include "sdxlemur-mtp-audio-overlay.dtsi" #include "sdxlemur-bluetooth.dtsi" +#include "display/sdxlemur-qpic-display.dtsi" / { model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x2020008 0x302>; + qcom,board-id = <0x2010008 0x302>; }; diff --git a/qcom/sdxlemur-v2-mtp.dts b/qcom/sdxlemur-v2-mtp.dts index cac68602ccf4..467fc0fc7a10 100644 --- a/qcom/sdxlemur-v2-mtp.dts +++ b/qcom/sdxlemur-v2-mtp.dts @@ -11,5 +11,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR MTP V2"; compatible = "qcom,sdxlemur-mtp", "qcom,sdxlemur", "qcom,mtp"; - qcom,board-id = <0x20008 0x300>; + qcom,board-id = <0x08 0x300>; }; diff --git a/qcom/sdxlemur-v2-rcm-pcie-ep.dts b/qcom/sdxlemur-v2-rcm-pcie-ep.dts index b22c1df9690e..c2726331b1a9 100644 --- a/qcom/sdxlemur-v2-rcm-pcie-ep.dts +++ b/qcom/sdxlemur-v2-rcm-pcie-ep.dts @@ -8,5 +8,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR RCM PCIe-EP V2"; compatible = "qcom,sdxlemur-rcm", "qcom,sdxlemur", "qcom,rcm"; - qcom,board-id = <0x1020015 0x201>; + qcom,board-id = <0x1010015 0x201>; }; diff --git a/qcom/sdxlemur-v2-rcm-rc.dts b/qcom/sdxlemur-v2-rcm-rc.dts index 5f66a7bfd927..3fea6cbf8473 100644 --- a/qcom/sdxlemur-v2-rcm-rc.dts +++ b/qcom/sdxlemur-v2-rcm-rc.dts @@ -11,5 +11,5 @@ model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex V2"; compatible = "qcom,sdxlemur-rcm", "qcom,sdxlemur", "qcom,rcm"; - qcom,board-id = <0x20015 0x300>; + qcom,board-id = <0x10015 0x300>; }; diff --git a/qcom/sdxlemur-v2.dtsi b/qcom/sdxlemur-v2.dtsi index fab47d03133a..0b315bf8c2be 100644 --- a/qcom/sdxlemur-v2.dtsi +++ b/qcom/sdxlemur-v2.dtsi @@ -3,7 +3,7 @@ / { model = "Qualcomm Technologies, Inc. SDXLEMUR V2"; compatible = "qcom,sdxlemur"; - qcom,msm-id = <458 0x20000>, <483 0x20000>; + qcom,msm-id = <458 0x20000>, <483 0x20000>, <509 0x20000>; }; &i2c_1 {