ARM: dts: msm: Add support for Waipio v2

Add initial devicetrees for waipio v2 SoC. Change-Id: Ia15fd0b7fcb406eedf79906ea1464be063a57ab5
2026-01-27 14:44:08 +00:00 · 2021-05-21 15:27:18 -07:00
parent ffa2f30565
commit 6bf3ea8608
30 changed files with 248 additions and 23 deletions
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -91,20 +91,20 @@ dtbo-$(CONFIG_ARCH_WAIPIO) += waipio-rumi-overlay.dtbo \
 	waipio-lemur-cdp-pm8008-overlay.dtbo \
 	waipio-lemur-cdp-pm8010-overlay.dtbo

-waipio-rumi-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-qrd-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-atp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-mtp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-qrd-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-qrd-pm8010-2s-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-atp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb
-waipio-lemur-mtp-pm8008-overlay.dtbo-base := waipio.dtb
-waipio-lemur-mtp-pm8010-overlay.dtbo-base := waipio.dtb
-waipio-lemur-cdp-pm8008-overlay.dtbo-base := waipio.dtb
-waipio-lemur-cdp-pm8010-overlay.dtbo-base := waipio.dtb
+waipio-rumi-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-qrd-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-atp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-mtp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-qrd-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-qrd-pm8010-2s-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-atp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
+waipio-lemur-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-lemur-mtp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-lemur-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-lemur-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
 else
 dtb-$(CONFIG_ARCH_WAIPIO) += waipio-rumi.dtb \
 	waipio-mtp-pm8008.dtb \
@@ -123,6 +123,23 @@ dtb-$(CONFIG_ARCH_WAIPIO) += waipio-rumi.dtb \
 	waipiop-cdp-pm8010.dtb \
 	waipiop-qrd-pm8010.dtb \
 	waipiop-qrd-pm8010-2s.dtb
+# Waipio V2
+dtb-$(CONFIG_ARCH_WAIPIO) += waipio-v2-mtp-pm8008.dtb \
+	waipio-v2-cdp-pm8008.dtb \
+	waipio-v2-qrd-pm8008.dtb \
+	waipio-v2-atp-pm8008.dtb \
+	waipio-v2-mtp-pm8010.dtb \
+	waipio-v2-cdp-pm8010.dtb \
+	waipio-v2-qrd-pm8010.dtb \
+	waipio-v2-qrd-pm8010-2s.dtb \
+	waipio-v2-atp-pm8010.dtb \
+	waipiop-v2-mtp-pm8008.dtb \
+	waipiop-v2-cdp-pm8008.dtb \
+	waipiop-v2-qrd-pm8008.dtb \
+	waipiop-v2-mtp-pm8010.dtb \
+	waipiop-v2-cdp-pm8010.dtb \
+	waipiop-v2-qrd-pm8010.dtb \
+	waipiop-v2-qrd-pm8010-2s.dtb
 endif

 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
--- a/qcom/waipio-atp-pm8008-overlay.dts
+++ b/qcom/waipio-atp-pm8008-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio ATP with PM8008";
 	compatible = "qcom,waipio-atp", "qcom,waipio", "qcom,atp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10021 0>;
 };
--- a/qcom/waipio-atp-pm8010-overlay.dts
+++ b/qcom/waipio-atp-pm8010-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio ATP with PM8010";
 	compatible = "qcom,waipio-atp", "qcom,waipio", "qcom,atp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10021 0>;
 };
--- a/qcom/waipio-cdp-pm8008-overlay.dts
+++ b/qcom/waipio-cdp-pm8008-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio CDP with PM8008";
 	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10001 0>;
 };
--- a/qcom/waipio-cdp-pm8010-overlay.dts
+++ b/qcom/waipio-cdp-pm8010-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio CDP with PM8010";
 	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10001 0>;
 };
--- a/qcom/waipio-mtp-pm8008-overlay.dts
+++ b/qcom/waipio-mtp-pm8008-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio MTP with PM8008";
 	compatible = "qcom,waipio-mtp", "qcom,waipio", "qcom,mtp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10008 0>;
 };
--- a/qcom/waipio-mtp-pm8010-overlay.dts
+++ b/qcom/waipio-mtp-pm8010-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio MTP with PM8010";
 	compatible = "qcom,waipio-mtp", "qcom,waipio", "qcom,mtp";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x10008 0>;
 };
--- a/qcom/waipio-qrd-pm8008-overlay.dts
+++ b/qcom/waipio-qrd-pm8008-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio QRD with PM8008";
 	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x1000B 0>;
 };
--- a/qcom/waipio-qrd-pm8010-2s-overlay.dts
+++ b/qcom/waipio-qrd-pm8010-2s-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio QRD with PM8010 + 2S";
 	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x2000b 0>;
 };
--- a/qcom/waipio-qrd-pm8010-overlay.dts
+++ b/qcom/waipio-qrd-pm8010-overlay.dts
@@ -7,6 +7,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Waipio QRD with PM8010";
 	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
-	qcom,msm-id = <457 0x10000>, <482 0x10000>;
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
 	qcom,board-id = <0x1000b 0>;
 };
--- a/qcom/waipio-v2-atp-pm8008.dts
+++ b/qcom/waipio-v2-atp-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-atp.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 ATP with PM8008";
+	compatible = "qcom,waipio-atp", "qcom,waipio", "qcom,atp";
+	qcom,board-id = <33 0>;
+};
--- a/qcom/waipio-v2-atp-pm8010.dts
+++ b/qcom/waipio-v2-atp-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-atp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 ATP with PM8010";
+	compatible = "qcom,waipio-atp", "qcom,waipio", "qcom,atp";
+	qcom,board-id = <0x10021 0>;
+};
--- a/qcom/waipio-v2-cdp-pm8008.dts
+++ b/qcom/waipio-v2-cdp-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 CDP with PM8008";
+	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
+	qcom,board-id = <1 0>;
+};
--- a/qcom/waipio-v2-cdp-pm8010.dts
+++ b/qcom/waipio-v2-cdp-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 CDP with PM8010";
+	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
--- a/qcom/waipio-v2-mtp-pm8008.dts
+++ b/qcom/waipio-v2-mtp-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-mtp.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 MTP with PM8008";
+	compatible = "qcom,waipio-mtp", "qcom,waipio", "qcom,mtp";
+	qcom,board-id = <8 0>;
+};
--- a/qcom/waipio-v2-mtp-pm8010.dts
+++ b/qcom/waipio-v2-mtp-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-mtp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 MTP with PM8010";
+	compatible = "qcom,waipio-mtp", "qcom,waipio", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
--- a/qcom/waipio-v2-qrd-pm8008.dts
+++ b/qcom/waipio-v2-qrd-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-qrd.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 QRD with PM8008";
+	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
+	qcom,board-id = <11 0>;
+};
--- a/qcom/waipio-v2-qrd-pm8010-2s.dts
+++ b/qcom/waipio-v2-qrd-pm8010-2s.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-qrd-2s.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 QRD with PM8010 + 2S";
+	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
+	qcom,board-id = <0x2000b 0>;
+};
--- a/qcom/waipio-v2-qrd-pm8010.dts
+++ b/qcom/waipio-v2-qrd-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+#include "waipio-qrd.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 QRD with PM8010";
+	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
+	qcom,board-id = <0x1000b 0>;
+};
--- a/qcom/waipio-v2.dts
+++ b/qcom/waipio-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "waipio-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2 SoC";
+	compatible = "qcom,waipio";
+	qcom,board-id = <0 0>;
+};
--- a/qcom/waipio-v2.dtsi
+++ b/qcom/waipio-v2.dtsi
@@ -0,0 +1,7 @@
+#include "waipio.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio v2";
+	compatible = "qcom,waipio";
+	qcom,msm-id = <457 0x20000>;
+};
--- a/qcom/waipiop-v2-cdp-pm8008.dts
+++ b/qcom/waipiop-v2-cdp-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 CDP with PM8008";
+	compatible = "qcom,waipiop-cdp", "qcom,waipiop", "qcom,cdp";
+	qcom,board-id = <1 0>;
+};
--- a/qcom/waipiop-v2-cdp-pm8010.dts
+++ b/qcom/waipiop-v2-cdp-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 CDP with PM8010";
+	compatible = "qcom,waipiop-cdp", "qcom,waipiop", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
--- a/qcom/waipiop-v2-mtp-pm8008.dts
+++ b/qcom/waipiop-v2-mtp-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-mtp.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 MTP with PM8008";
+	compatible = "qcom,waipiop-mtp", "qcom,waipiop", "qcom,mtp";
+	qcom,board-id = <8 0>;
+};
--- a/qcom/waipiop-v2-mtp-pm8010.dts
+++ b/qcom/waipiop-v2-mtp-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-mtp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 MTP with PM8010";
+	compatible = "qcom,waipiop-mtp", "qcom,waipiop", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
--- a/qcom/waipiop-v2-qrd-pm8008.dts
+++ b/qcom/waipiop-v2-qrd-pm8008.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-qrd.dtsi"
+#include "waipio-pm8008.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 QRD with PM8008";
+	compatible = "qcom,waipiop-qrd", "qcom,waipiop", "qcom,qrd";
+	qcom,board-id = <11 0>;
+};
--- a/qcom/waipiop-v2-qrd-pm8010-2s.dts
+++ b/qcom/waipiop-v2-qrd-pm8010-2s.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-qrd-2s.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 QRD with PM8010";
+	compatible = "qcom,waipiop-qrd", "qcom,waipiop", "qcom,qrd";
+	qcom,board-id = <0x2000b 0>;
+};
--- a/qcom/waipiop-v2-qrd-pm8010.dts
+++ b/qcom/waipiop-v2-qrd-pm8010.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+#include "waipio-qrd.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 QRD with PM8010";
+	compatible = "qcom,waipiop-qrd", "qcom,waipiop", "qcom,qrd";
+	qcom,board-id = <0x1000b 0>;
+};
--- a/qcom/waipiop-v2.dts
+++ b/qcom/waipiop-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "waipiop-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2 SoC";
+	compatible = "qcom,waipiop";
+	qcom,board-id = <0 0>;
+};
--- a/qcom/waipiop-v2.dtsi
+++ b/qcom/waipiop-v2.dtsi
@@ -0,0 +1,7 @@
+#include "waipiop.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. WaipioP v2";
+	compatible = "qcom,waipiop";
+	qcom,msm-id = <482 0x20000>;
+};