From f2bcfc797d916b5bbf6b46b5390963ff7b7e1583 Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Wed, 6 Dec 2023 16:26:06 -0800 Subject: [PATCH] ARM: dts: msm: Support for APQ variant on Sun SoC Add v1 and v2 DT support for APQ variant. Change-Id: I9ea89b9fd022ddaf2fc5481acac16f720a725f7f Signed-off-by: Unnathi Chalicheemala --- qcom/Makefile | 1 + qcom/platform_map.bzl | 8 ++++++++ qcom/sun-cdp-kiwi-overlay.dts | 2 +- qcom/sun-cdp-nfc-overlay.dts | 2 +- qcom/sun-cdp-v8-overlay.dts | 2 +- qcom/sun-mtp-kiwi-overlay.dts | 2 +- qcom/sun-mtp-kiwi-v8-overlay.dts | 2 +- qcom/sun-mtp-nfc-overlay.dts | 2 +- qcom/sun-mtp-overlay.dts | 2 +- qcom/sun-mtp-v8-overlay.dts | 2 +- qcom/sun-oemvm.dtsi | 2 +- qcom/sun-qrd-sku1-overlay.dts | 2 +- qcom/sun-qrd-sku1-v8-overlay.dts | 2 +- qcom/sun-qrd-sku2-v8-overlay.dts | 2 +- qcom/sun-vm.dtsi | 2 +- 15 files changed, 22 insertions(+), 13 deletions(-) diff --git a/qcom/Makefile b/qcom/Makefile index 297acf4c..40db860d 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -16,6 +16,7 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o ifneq ($(CONFIG_ARCH_QTI_VM), y) SUN_BASE_DTB += sun.dtb sun-v2.dtb +SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb SUN_BOARDS += \ sun-mtp-kiwi-overlay.dtbo \ diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index c38a9942..b6a1f74e 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -3,6 +3,14 @@ _platform_map = { "dtb_list": [ # keep sorted {"name": "sun.dtb"}, + { + "name": "sunp.dtb", + "apq": True, + }, + { + "name": "sunp-v2.dtb", + "apq": True, + }, {"name": "sun-v2.dtb"}, ], "dtbo_list": [ diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts index b78d6ab2..d4e41ba8 100644 --- a/qcom/sun-cdp-kiwi-overlay.dts +++ b/qcom/sun-cdp-kiwi-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20001 0>; }; diff --git a/qcom/sun-cdp-nfc-overlay.dts b/qcom/sun-cdp-nfc-overlay.dts index 37a79eca..d5929915 100644 --- a/qcom/sun-cdp-nfc-overlay.dts +++ b/qcom/sun-cdp-nfc-overlay.dts @@ -11,6 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP SN300 NFC"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x40001 0>; }; diff --git a/qcom/sun-cdp-v8-overlay.dts b/qcom/sun-cdp-v8-overlay.dts index fed67a8a..68c3aa4f 100644 --- a/qcom/sun-cdp-v8-overlay.dts +++ b/qcom/sun-cdp-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP V8 Power Grid"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>; }; diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts index dc4250ed..ce7816c1 100644 --- a/qcom/sun-mtp-kiwi-overlay.dts +++ b/qcom/sun-mtp-kiwi-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20008 0>; }; diff --git a/qcom/sun-mtp-kiwi-v8-overlay.dts b/qcom/sun-mtp-kiwi-v8-overlay.dts index 053221c0..cd0d10f3 100644 --- a/qcom/sun-mtp-kiwi-v8-overlay.dts +++ b/qcom/sun-mtp-kiwi-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN V8 Power Grid"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50008 0>; }; diff --git a/qcom/sun-mtp-nfc-overlay.dts b/qcom/sun-mtp-nfc-overlay.dts index a287787d..6aa03e84 100644 --- a/qcom/sun-mtp-nfc-overlay.dts +++ b/qcom/sun-mtp-nfc-overlay.dts @@ -11,6 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP SN300 NFC"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x30008 0>; }; diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts index 78ef967b..983d05f7 100644 --- a/qcom/sun-mtp-overlay.dts +++ b/qcom/sun-mtp-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <8 0>; }; diff --git a/qcom/sun-mtp-v8-overlay.dts b/qcom/sun-mtp-v8-overlay.dts index 3abd277a..45b44f41 100644 --- a/qcom/sun-mtp-v8-overlay.dts +++ b/qcom/sun-mtp-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP V8 Power Grid"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x40008 0>; }; diff --git a/qcom/sun-oemvm.dtsi b/qcom/sun-oemvm.dtsi index a9a96bf1..860c6042 100644 --- a/qcom/sun-oemvm.dtsi +++ b/qcom/sun-oemvm.dtsi @@ -8,7 +8,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; interrupt-parent = <&vgic>; chosen { diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts index f2c014de..15d9cb96 100644 --- a/qcom/sun-qrd-sku1-overlay.dts +++ b/qcom/sun-qrd-sku1-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/sun-qrd-sku1-v8-overlay.dts b/qcom/sun-qrd-sku1-v8-overlay.dts index 99de5ceb..eea7ca7b 100644 --- a/qcom/sun-qrd-sku1-v8-overlay.dts +++ b/qcom/sun-qrd-sku1-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x3000B 0>; }; diff --git a/qcom/sun-qrd-sku2-v8-overlay.dts b/qcom/sun-qrd-sku2-v8-overlay.dts index 08b1c9e0..da4cb58b 100644 --- a/qcom/sun-qrd-sku2-v8-overlay.dts +++ b/qcom/sun-qrd-sku2-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU2 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi index e9a22c28..5c901a5c 100644 --- a/qcom/sun-vm.dtsi +++ b/qcom/sun-vm.dtsi @@ -9,7 +9,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; interrupt-parent = <&vgic>; chosen {