From 8dcc77823b472bd453b36d9775e1768ad56ad84c Mon Sep 17 00:00:00 2001 From: Lijuan Gao Date: Wed, 31 Mar 2021 14:38:19 +0800 Subject: [PATCH] ARM: dts: msm: Correct the soc dts info for HHG HSP Pro platform HHG HSP Pro uses P variant, so correct the soc dts for it. Change-Id: I761e81edb5c914c4a1e793d31873d3f85366c89e --- qcom/Makefile | 6 +++--- qcom/lahaina-v2.1-hhg-hsp-pro.dts | 10 ---------- ...ro-overlay.dts => lahainap-hhg-hsp-pro-overlay.dts} | 4 ++-- ...aina-hhg-hsp-pro.dtsi => lahainap-hhg-hsp-pro.dtsi} | 0 qcom/lahainap-v2.1-hhg-hsp-pro.dts | 10 ++++++++++ 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 qcom/lahaina-v2.1-hhg-hsp-pro.dts rename qcom/{lahaina-hhg-hsp-pro-overlay.dts => lahainap-hhg-hsp-pro-overlay.dts} (55%) rename qcom/{lahaina-hhg-hsp-pro.dtsi => lahainap-hhg-hsp-pro.dtsi} (100%) create mode 100644 qcom/lahainap-v2.1-hhg-hsp-pro.dts diff --git a/qcom/Makefile b/qcom/Makefile index 3ff3cd7551c7..4ec82fb9e8c9 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -8,7 +8,7 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ lahaina-atp-overlay.dtbo \ lahaina-hdk-overlay.dtbo \ lahaina-hhg-overlay.dtbo \ - lahaina-hhg-hsp-pro-overlay.dtbo \ + lahainap-hhg-hsp-pro-overlay.dtbo \ lahaina-qrd-hsp-overlay.dtbo \ lahaina-qrd-module-overlay.dtbo \ lahainap-mtp-overlay.dtbo \ @@ -29,7 +29,7 @@ lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb lahaina-atp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb lahaina-hdk-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb lahaina-hhg-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb -lahaina-hhg-hsp-pro-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb +lahainap-hhg-hsp-pro-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb @@ -79,7 +79,7 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ lahaina-v2.1-atp.dtb \ lahaina-v2.1-hdk.dtb \ lahaina-v2.1-hhg.dtb \ - lahaina-v2.1-hhg-hsp-pro.dtb \ + lahainap-v2.1-hhg-hsp-pro.dtb \ lahaina-v2.1-qrd.dtb \ lahaina-v2.1-qrd-module.dtb \ lahainap-v2.1-mtp.dtb \ diff --git a/qcom/lahaina-v2.1-hhg-hsp-pro.dts b/qcom/lahaina-v2.1-hhg-hsp-pro.dts deleted file mode 100644 index dce431e5d4ed..000000000000 --- a/qcom/lahaina-v2.1-hhg-hsp-pro.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; - -#include "lahaina-v2.1.dtsi" -#include "lahaina-hhg-hsp-pro.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Lahaina HHG-HSP-PRO"; - compatible = "qcom,lahaina-hdk", "qcom,lahaina", "qcom,hdk"; - qcom,board-id = <0x1001f 0x02>; -}; diff --git a/qcom/lahaina-hhg-hsp-pro-overlay.dts b/qcom/lahainap-hhg-hsp-pro-overlay.dts similarity index 55% rename from qcom/lahaina-hhg-hsp-pro-overlay.dts rename to qcom/lahainap-hhg-hsp-pro-overlay.dts index 0fd700376d25..52c065d37e35 100644 --- a/qcom/lahaina-hhg-hsp-pro-overlay.dts +++ b/qcom/lahainap-hhg-hsp-pro-overlay.dts @@ -1,10 +1,10 @@ /dts-v1/; /plugin/; -#include "lahaina-hhg-hsp-pro.dtsi" +#include "lahainap-hhg-hsp-pro.dtsi" / { - model = "Qualcomm Technologies, Inc. Lahaina HHG-HSP-PRO"; + model = "Qualcomm Technologies, Inc. Lahainap HHG-HSP-PRO"; compatible = "qcom,lahaina-hdk", "qcom,lahaina", "qcom,hdk"; qcom,board-id = <0x1001f 0x02>; }; diff --git a/qcom/lahaina-hhg-hsp-pro.dtsi b/qcom/lahainap-hhg-hsp-pro.dtsi similarity index 100% rename from qcom/lahaina-hhg-hsp-pro.dtsi rename to qcom/lahainap-hhg-hsp-pro.dtsi diff --git a/qcom/lahainap-v2.1-hhg-hsp-pro.dts b/qcom/lahainap-v2.1-hhg-hsp-pro.dts new file mode 100644 index 000000000000..0ce56fd4bab6 --- /dev/null +++ b/qcom/lahainap-v2.1-hhg-hsp-pro.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "lahainap-v2.1.dtsi" +#include "lahainap-hhg-hsp-pro.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Lahainap HHG-HSP-PRO"; + compatible = "qcom,lahaina-hdk", "qcom,lahaina", "qcom,hdk"; + qcom,board-id = <0x1001f 0x02>; +};