ARM: dts: qcom: Add APQ variant device trees for diwali

ARM: dts: qcom: Add APQ variant device trees for diwali. Change-Id: Iadce63f6e8c97a32eb88ee6ae39439d73cd12c96
2026-02-01 08:51:30 +00:00 · 2022-01-04 01:35:59 -08:00
parent c88dd24da1
commit 7dc4aa0b46
26 changed files with 153 additions and 18 deletions
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -90,7 +90,7 @@ SoCs:
  compatible = "qcom,waipio", "qcom,waipiop"

 - DIWALI
-  compatible = "qcom,diwali"
+  compatible = "qcom,diwali", "qcom,diwalip"

 - CAPE
  compatible = "qcom,cape", "qcom,cape-v2", "qcom,capep"
@@ -278,5 +278,8 @@ compatible = "qcom,diwali-rumi"
 compatible = "qcom,diwali-idp"
 compatible = "qcom,diwali-qrd"
 compatible = "qcom,diwali-atp"
+compatible = "qcom,diwalip-idp"
+compatible = "qcom,diwalip-qrd"
+compatible = "qcom,diwalip-atp"
 compatible = "qcom,neo-rumi"
 compatible = "qcom,parrot-rumi"
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -174,14 +174,14 @@ dtbo-$(CONFIG_ARCH_DIWALI) += diwali-rumi-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-amoled-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
+diwali-idp-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-atp-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-qrd-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-idp-amoled-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-idp-usbc-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-idp-hsp-overlay.dtbo-base := diwali-hsp.dtb diwalip.dtb
+diwali-idp-nopmi-overlay.dtbo-base := diwali.dtb diwalip.dtb
+diwali-qrd-nopmi-overlay.dtbo-base := diwali.dtb diwalip.dtb
 else
 dtb-$(CONFIG_ARCH_DIWALI) += diwali-rumi.dtb \
 	diwali-idp.dtb \
@@ -191,7 +191,15 @@ dtb-$(CONFIG_ARCH_DIWALI) += diwali-rumi.dtb \
 	diwali-idp-usbc.dtb \
 	diwali-idp-hsp.dtb \
 	diwali-idp-nopmi.dtb \
-	diwali-qrd-nopmi.dtb
+	diwali-qrd-nopmi.dtb \
+	diwalip-idp.dtb \
+	diwalip-atp.dtb \
+	diwalip-qrd.dtb \
+	diwalip-idp-amoled.dtb \
+	diwalip-idp-usbc.dtb \
+	diwalip-idp-hsp.dtb \
+	diwalip-idp-nopmi.dtb \
+	diwalip-qrd-nopmi.dtb
 endif

 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
--- a/qcom/diwali-atp-overlay.dts
+++ b/qcom/diwali-atp-overlay.dts
@@ -6,7 +6,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali ATP";
 	compatible = "qcom,diwali-atp", "qcom,diwali", "qcom,atp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <33 0>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwali-idp-amoled-overlay.dts
+++ b/qcom/diwali-idp-amoled-overlay.dts
@@ -6,7 +6,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali IDP AMOLED";
 	compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <34 3>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwali-idp-hsp-overlay.dts
+++ b/qcom/diwali-idp-hsp-overlay.dts
@@ -7,7 +7,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali IDP + HSP";
 	compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <34 2>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwali-idp-nopmi-overlay.dts
+++ b/qcom/diwali-idp-nopmi-overlay.dts
@@ -6,7 +6,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali IDP NOPMI";
 	compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <34 0>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>;
--- a/qcom/diwali-idp-overlay.dts
+++ b/qcom/diwali-idp-overlay.dts
@@ -7,7 +7,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali IDP";
 	compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <34 0>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwali-idp-usbc-overlay.dts
+++ b/qcom/diwali-idp-usbc-overlay.dts
@@ -6,7 +6,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali IDP USBC audio";
 	compatible = "qcom,diwali-idp", "qcom,diwali", "qcom,idp";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <34 1>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwali-qrd-nopmi-overlay.dts
+++ b/qcom/diwali-qrd-nopmi-overlay.dts
@@ -6,7 +6,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali QRD NOPMI";
 	compatible = "qcom,diwali-qrd", "qcom,diwali", "qcom,qrd";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <0x1000B 0>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>;
--- a/qcom/diwali-qrd-overlay.dts
+++ b/qcom/diwali-qrd-overlay.dts
@@ -7,7 +7,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Diwali QRD";
 	compatible = "qcom,diwali-qrd", "qcom,diwali", "qcom,qrd";
-	qcom,msm-id = <506 0x10000>;
+	qcom,msm-id = <506 0x10000>, <547 0x10000>;
 	qcom,board-id = <0x1000B 0>;
 	qcom,pmic-id-size = <9>;
 	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
--- a/qcom/diwalip-atp.dts
+++ b/qcom/diwalip-atp.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-atp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP ATP";
+	compatible = "qcom,diwalip-atp", "qcom,diwalip", "qcom,atp";
+	qcom,board-id = <33 0>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-atp.dtsi
+++ b/qcom/diwalip-atp.dtsi
@@ -0,0 +1 @@
+#include "diwali-atp.dtsi"
--- a/qcom/diwalip-idp-amoled.dts
+++ b/qcom/diwalip-idp-amoled.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-idp-amoled.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP IDP AMOLED";
+	compatible = "qcom,diwalip-idp", "qcom,diwalip", "qcom,idp";
+	qcom,board-id = <34 3>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-idp-amoled.dtsi
+++ b/qcom/diwalip-idp-amoled.dtsi
@@ -0,0 +1 @@
+#include "diwali-idp-amoled.dtsi"
--- a/qcom/diwalip-idp-hsp.dts
+++ b/qcom/diwalip-idp-hsp.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-idp-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP IDP + HSP";
+	compatible = "qcom,diwalip-idp", "qcom,diwalip", "qcom,idp";
+	qcom,board-id = <34 2>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-idp-hsp.dtsi
+++ b/qcom/diwalip-idp-hsp.dtsi
@@ -0,0 +1 @@
+#include "diwali-idp-hsp.dtsi"
--- a/qcom/diwalip-idp-nopmi.dts
+++ b/qcom/diwalip-idp-nopmi.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-idp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP IDP NOPMI";
+	compatible = "qcom,diwalip-idp", "qcom,diwalip", "qcom,idp";
+	qcom,board-id = <34 0>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>;
+};
--- a/qcom/diwalip-idp-usbc.dts
+++ b/qcom/diwalip-idp-usbc.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-idp-usbc.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP IDP USBC audio";
+	compatible = "qcom,diwalip-idp", "qcom,diwalip", "qcom,idp";
+	qcom,board-id = <34 1>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-idp-usbc.dtsi
+++ b/qcom/diwalip-idp-usbc.dtsi
@@ -0,0 +1 @@
+#include "diwali-idp-usbc.dtsi"
--- a/qcom/diwalip-idp.dts
+++ b/qcom/diwalip-idp.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwali-idp.dtsi"
+#include "diwali-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP IDP";
+	compatible = "qcom,diwalip-idp", "qcom,diwalip", "qcom,idp";
+	qcom,board-id = <34 0>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-idp.dtsi
+++ b/qcom/diwalip-idp.dtsi
@@ -0,0 +1 @@
+#include "diwali-idp.dtsi"
--- a/qcom/diwalip-qrd-nopmi.dts
+++ b/qcom/diwalip-qrd-nopmi.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwalip-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP QRD NOPMI";
+	compatible = "qcom,diwalip-qrd", "qcom,diwalip", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>;
+};
--- a/qcom/diwalip-qrd.dts
+++ b/qcom/diwalip-qrd.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+#include "diwali-qrd.dtsi"
+#include "diwali-qrd-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP QRD";
+	compatible = "qcom,diwalip-qrd", "qcom,diwalip", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+	qcom,pmic-id-size = <9>;
+	qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x2E>;
+};
--- a/qcom/diwalip-qrd.dtsi
+++ b/qcom/diwalip-qrd.dtsi
@@ -0,0 +1 @@
+#include "diwali-qrd.dtsi"
--- a/qcom/diwalip.dts
+++ b/qcom/diwalip.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "diwalip.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP SoC";
+	compatible = "qcom,diwalip";
+	qcom,board-id = <0 0>;
+};
--- a/qcom/diwalip.dtsi
+++ b/qcom/diwalip.dtsi
@@ -0,0 +1,11 @@
+#include "diwali.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. DiwaliP";
+	compatible = "qcom,diwalip";
+	qcom,msm-id = <547 0x10000>;
+};
+
+&ipa_hw {
+	status = "disabled";
+};