From f9502c24a11901a4b66889da2ed08239be9060d5 Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Thu, 23 Sep 2021 13:13:49 +0530 Subject: [PATCH 1/2] ARM: dts: msm: Add DT support for nopmi on Diwali target Add support for nopmi version of Diwali platform. Change-Id: Ifcec55b6eca25092db69940899da60fcf5ed1931 --- qcom/Makefile | 10 ++++++++-- qcom/diwali-idp-nopmi-overlay.dts | 11 +++++++++++ qcom/diwali-idp-nopmi.dts | 10 ++++++++++ qcom/diwali-idp-nopmi.dtsi | 2 ++ qcom/diwali-qrd-nopmi-overlay.dts | 11 +++++++++++ qcom/diwali-qrd-nopmi.dts | 10 ++++++++++ qcom/diwali-qrd-nopmi.dtsi | 2 ++ 7 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 qcom/diwali-idp-nopmi-overlay.dts create mode 100644 qcom/diwali-idp-nopmi.dts create mode 100644 qcom/diwali-idp-nopmi.dtsi create mode 100644 qcom/diwali-qrd-nopmi-overlay.dts create mode 100644 qcom/diwali-qrd-nopmi.dts create mode 100644 qcom/diwali-qrd-nopmi.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 26f14a0e..1e259780 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -161,15 +161,21 @@ endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_DIWALI) += diwali-rumi-overlay.dtbo \ diwali-idp-overlay.dtbo \ - diwali-qrd-overlay.dtbo + diwali-qrd-overlay.dtbo \ + diwali-idp-nopmi-overlay.dtbo \ + diwali-qrd-nopmi-overlay.dtbo diwali-rumi-overlay.dtbo-base := diwali.dtb diwali-idp-overlay.dtbo-base := diwali.dtb diwali-qrd-overlay.dtbo-base := diwali.dtb +diwali-idp-nopmi-overlay.dtbo-base := diwali.dtb +diwali-qrd-nopmi-overlay.dtbo-base := diwali.dtb else dtb-$(CONFIG_ARCH_DIWALI) += diwali-rumi.dtb \ diwali-idp.dtb \ - diwali-qrd.dtb + diwali-qrd.dtb \ + diwali-idp-nopmi.dtb \ + diwali-qrd-nopmi.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) diff --git a/qcom/diwali-idp-nopmi-overlay.dts b/qcom/diwali-idp-nopmi-overlay.dts new file mode 100644 index 00000000..5d6a7f35 --- /dev/null +++ b/qcom/diwali-idp-nopmi-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "diwali-idp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP NOPMI"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,msm-id = <506 0x10000>; + qcom,board-id = <34 0>; +}; diff --git a/qcom/diwali-idp-nopmi.dts b/qcom/diwali-idp-nopmi.dts new file mode 100644 index 00000000..211ab6af --- /dev/null +++ b/qcom/diwali-idp-nopmi.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "diwali.dtsi" +#include "diwali-idp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP NOPMI"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,board-id = <34 0>; +}; diff --git a/qcom/diwali-idp-nopmi.dtsi b/qcom/diwali-idp-nopmi.dtsi new file mode 100644 index 00000000..17f1e228 --- /dev/null +++ b/qcom/diwali-idp-nopmi.dtsi @@ -0,0 +1,2 @@ +&soc { +}; diff --git a/qcom/diwali-qrd-nopmi-overlay.dts b/qcom/diwali-qrd-nopmi-overlay.dts new file mode 100644 index 00000000..e831dcf9 --- /dev/null +++ b/qcom/diwali-qrd-nopmi-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "diwali-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali QRD NOPMI"; + compatible = "qcom,diwali-qrd", "qcom,diwali", "qcom,qrd"; + qcom,msm-id = <506 0x10000>; + qcom,board-id = <0x1000B 0>; +}; diff --git a/qcom/diwali-qrd-nopmi.dts b/qcom/diwali-qrd-nopmi.dts new file mode 100644 index 00000000..00cc5dfe --- /dev/null +++ b/qcom/diwali-qrd-nopmi.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "diwali.dtsi" +#include "diwali-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali QRD NOPMI"; + compatible = "qcom,diwali-qrd", "qcom,diwali", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; +}; diff --git a/qcom/diwali-qrd-nopmi.dtsi b/qcom/diwali-qrd-nopmi.dtsi new file mode 100644 index 00000000..17f1e228 --- /dev/null +++ b/qcom/diwali-qrd-nopmi.dtsi @@ -0,0 +1,2 @@ +&soc { +}; From 4fbc9c4950703b1dd635462189ae791d59a9ce2c Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Fri, 24 Sep 2021 12:55:41 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Add DT support for ATP/HSP/Audio+usbc for Diwali Add DT support for ATP/IDP+HSP/IDP+Audio+usbc for Diwali. Change-Id: I16138cb6e7be683ff46d06227c202de89af076c5 --- bindings/arm/msm/msm.txt | 1 + qcom/Makefile | 9 +++++++++ qcom/diwali-atp-overlay.dts | 11 +++++++++++ qcom/diwali-atp.dts | 10 ++++++++++ qcom/diwali-atp.dtsi | 2 ++ qcom/diwali-hsp.dts | 9 +++++++++ qcom/diwali-hsp.dtsi | 4 ++++ qcom/diwali-idp-hsp-overlay.dts | 11 +++++++++++ qcom/diwali-idp-hsp.dts | 10 ++++++++++ qcom/diwali-idp-hsp.dtsi | 4 ++++ qcom/diwali-idp-usbc-overlay.dts | 11 +++++++++++ qcom/diwali-idp-usbc.dts | 10 ++++++++++ qcom/diwali-idp-usbc.dtsi | 2 ++ 13 files changed, 94 insertions(+) create mode 100644 qcom/diwali-atp-overlay.dts create mode 100644 qcom/diwali-atp.dts create mode 100644 qcom/diwali-atp.dtsi create mode 100644 qcom/diwali-hsp.dts create mode 100644 qcom/diwali-hsp.dtsi create mode 100644 qcom/diwali-idp-hsp-overlay.dts create mode 100644 qcom/diwali-idp-hsp.dts create mode 100644 qcom/diwali-idp-hsp.dtsi create mode 100644 qcom/diwali-idp-usbc-overlay.dts create mode 100644 qcom/diwali-idp-usbc.dts create mode 100644 qcom/diwali-idp-usbc.dtsi diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt index 9e6ae3e5..6b38e7f8 100644 --- a/bindings/arm/msm/msm.txt +++ b/bindings/arm/msm/msm.txt @@ -266,4 +266,5 @@ compatible = "qcom,cape-cdp" compatible = "qcom,diwali-rumi" compatible = "qcom,diwali-idp" compatible = "qcom,diwali-qrd" +compatible = "qcom,diwali-atp" compatible = "qcom,neo-rumi" diff --git a/qcom/Makefile b/qcom/Makefile index 1e259780..a689c3b4 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -161,19 +161,28 @@ endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_DIWALI) += diwali-rumi-overlay.dtbo \ diwali-idp-overlay.dtbo \ + diwali-atp-overlay.dtbo \ diwali-qrd-overlay.dtbo \ + diwali-idp-usbc-overlay.dtbo \ + diwali-idp-hsp-overlay.dtbo \ diwali-idp-nopmi-overlay.dtbo \ diwali-qrd-nopmi-overlay.dtbo diwali-rumi-overlay.dtbo-base := diwali.dtb diwali-idp-overlay.dtbo-base := diwali.dtb +diwali-atp-overlay.dtbo-base := diwali.dtb diwali-qrd-overlay.dtbo-base := diwali.dtb +diwali-idp-usbc-overlay.dtbo-base := diwali.dtb +diwali-idp-hsp-overlay.dtbo-base := diwali-hsp.dtb diwali-idp-nopmi-overlay.dtbo-base := diwali.dtb diwali-qrd-nopmi-overlay.dtbo-base := diwali.dtb else dtb-$(CONFIG_ARCH_DIWALI) += diwali-rumi.dtb \ diwali-idp.dtb \ + diwali-atp.dtb \ diwali-qrd.dtb \ + diwali-idp-usbc.dtb \ + diwali-idp-hsp.dtb \ diwali-idp-nopmi.dtb \ diwali-qrd-nopmi.dtb endif diff --git a/qcom/diwali-atp-overlay.dts b/qcom/diwali-atp-overlay.dts new file mode 100644 index 00000000..66d88820 --- /dev/null +++ b/qcom/diwali-atp-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "diwali-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali ATP"; + compatible = "qcom,diwali-atp", "qcom,diwali", "qcom,atp"; + qcom,msm-id = <506 0x10000>; + qcom,board-id = <33 0>; +}; diff --git a/qcom/diwali-atp.dts b/qcom/diwali-atp.dts new file mode 100644 index 00000000..094ed8d7 --- /dev/null +++ b/qcom/diwali-atp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "diwali.dtsi" +#include "diwali-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali ATP"; + compatible = "qcom,diwali-atp", "qcom,diwali", "qcom,atp"; + qcom,board-id = <33 0>; +}; diff --git a/qcom/diwali-atp.dtsi b/qcom/diwali-atp.dtsi new file mode 100644 index 00000000..17f1e228 --- /dev/null +++ b/qcom/diwali-atp.dtsi @@ -0,0 +1,2 @@ +&soc { +}; diff --git a/qcom/diwali-hsp.dts b/qcom/diwali-hsp.dts new file mode 100644 index 00000000..71c85406 --- /dev/null +++ b/qcom/diwali-hsp.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "diwali-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali HSP SoC"; + compatible = "qcom,diwali"; + qcom,board-id = <0 2>; +}; diff --git a/qcom/diwali-hsp.dtsi b/qcom/diwali-hsp.dtsi new file mode 100644 index 00000000..525d2b8d --- /dev/null +++ b/qcom/diwali-hsp.dtsi @@ -0,0 +1,4 @@ +#include "diwali.dtsi" + +/ { +}; diff --git a/qcom/diwali-idp-hsp-overlay.dts b/qcom/diwali-idp-hsp-overlay.dts new file mode 100644 index 00000000..7478f6e1 --- /dev/null +++ b/qcom/diwali-idp-hsp-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "diwali-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP + HSP"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,msm-id = <506 0x10000>; + qcom,board-id = <34 2>; +}; diff --git a/qcom/diwali-idp-hsp.dts b/qcom/diwali-idp-hsp.dts new file mode 100644 index 00000000..1c5686af --- /dev/null +++ b/qcom/diwali-idp-hsp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "diwali-hsp.dtsi" +#include "diwali-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP + HSP"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,board-id = <34 2>; +}; diff --git a/qcom/diwali-idp-hsp.dtsi b/qcom/diwali-idp-hsp.dtsi new file mode 100644 index 00000000..107fe5a7 --- /dev/null +++ b/qcom/diwali-idp-hsp.dtsi @@ -0,0 +1,4 @@ +#include "diwali-idp.dtsi" + +&soc { +}; diff --git a/qcom/diwali-idp-usbc-overlay.dts b/qcom/diwali-idp-usbc-overlay.dts new file mode 100644 index 00000000..120a996e --- /dev/null +++ b/qcom/diwali-idp-usbc-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "diwali-idp-usbc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP USBC audio"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,msm-id = <506 0x10000>; + qcom,board-id = <34 1>; +}; diff --git a/qcom/diwali-idp-usbc.dts b/qcom/diwali-idp-usbc.dts new file mode 100644 index 00000000..b185ae1c --- /dev/null +++ b/qcom/diwali-idp-usbc.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "diwali.dtsi" +#include "diwali-idp-usbc.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Diwali IDP USBC audio"; + compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp"; + qcom,board-id = <34 1>; +}; diff --git a/qcom/diwali-idp-usbc.dtsi b/qcom/diwali-idp-usbc.dtsi new file mode 100644 index 00000000..17f1e228 --- /dev/null +++ b/qcom/diwali-idp-usbc.dtsi @@ -0,0 +1,2 @@ +&soc { +};