diff --git a/qcom/Makefile b/qcom/Makefile index 25b4be94..a6bcf83a 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -53,7 +53,8 @@ sun-dtb-$(CONFIG_ARCH_SUN) += \ sun-overlays-dtb-$(CONFIG_ARCH_SUN) += $(SUN_BOARDS) $(NOAPQ_SUN_BOARDS) $(SUN_BASE_DTB) $(SUN_APQ_BASE_DTB) TUNA_BASE_DTB += tuna.dtb tuna7.dtb -NOAPQ_TUNA_BOARDS += \ +TUNA_APQ_BASE_DTB += tunap.dtb +TUNA_BOARDS += \ tuna-atp-overlay.dtbo \ tuna-cdp-overlay.dtbo \ tuna-mtp-kiwi-harmonium-overlay.dtbo \ @@ -64,12 +65,15 @@ NOAPQ_TUNA_BOARDS += \ tuna-mtp-kiwi-pmd802x-overlay.dtbo \ tuna-qrd-overlay.dtbo \ tuna-rcm-kiwi-overlay.dtbo \ - tuna-rcm-overlay.dtbo \ + tuna-rcm-overlay.dtbo + +NOAPQ_TUNA_BOARDS += \ tuna-rumi-overlay.dtbo sun-dtb-$(CONFIG_ARCH_TUNA) += \ - $(call add-overlays, $(NOAPQ_TUNA_BOARDS),$(TUNA_BASE_DTB)) -sun-overlays-dtb-$(CONFIG_ARCH_TUNA) += $(NOAPQ_TUNA_BOARDS) $(TUNA_BASE_DTB) + $(call add-overlays, $(TUNA_BOARDS) $(NOAPQ_TUNA_BOARDS),$(TUNA_BASE_DTB)) \ + $(call add-overlays, $(TUNA_BOARDS) $(APQ_TUNA_BOARDS),$(TUNA_APQ_BASE_DTB)) +sun-overlays-dtb-$(CONFIG_ARCH_TUNA) += $(TUNA_BOARDS) $(NOAPQ_TUNA_BOARDS) $(TUNA_BASE_DTB) $(TUNA_APQ_BASE_DTB) dtb-y += $(sun-dtb-y) KERA_BASE_DTB += kera.dtb diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 8f693e49..f9058814 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -77,6 +77,10 @@ _platform_map = { "dtb_list": [ {"name": "tuna.dtb"}, {"name": "tuna7.dtb"}, + { + "name": "tunap.dtb", + "apq": True, + }, ], "dtbo_list": [ { diff --git a/qcom/tuna-atp-overlay.dts b/qcom/tuna-atp-overlay.dts index 6c4d6b9a..890bec4f 100644 --- a/qcom/tuna-atp-overlay.dts +++ b/qcom/tuna-atp-overlay.dts @@ -15,6 +15,6 @@ compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,tunap-atp", "qcom,tunap", "qcom,atp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <33 0>; }; diff --git a/qcom/tuna-cdp-overlay.dts b/qcom/tuna-cdp-overlay.dts index 04abc04c..0a3ff93e 100644 --- a/qcom/tuna-cdp-overlay.dts +++ b/qcom/tuna-cdp-overlay.dts @@ -14,6 +14,6 @@ compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,tunap-cdp", "qcom,tunap", "qcom,cdp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <1 0>; }; diff --git a/qcom/tuna-mtp-kiwi-harmonium-overlay.dts b/qcom/tuna-mtp-kiwi-harmonium-overlay.dts index dfaff3ba..f5d40a7a 100644 --- a/qcom/tuna-mtp-kiwi-harmonium-overlay.dts +++ b/qcom/tuna-mtp-kiwi-harmonium-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN + Harmonium"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 3>; }; diff --git a/qcom/tuna-mtp-kiwi-overlay.dts b/qcom/tuna-mtp-kiwi-overlay.dts index bb6fefd8..73fc707a 100644 --- a/qcom/tuna-mtp-kiwi-overlay.dts +++ b/qcom/tuna-mtp-kiwi-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 2>; }; diff --git a/qcom/tuna-mtp-kiwi-pmd802x-overlay.dts b/qcom/tuna-mtp-kiwi-pmd802x-overlay.dts index a08d35a8..88cdeac5 100644 --- a/qcom/tuna-mtp-kiwi-pmd802x-overlay.dts +++ b/qcom/tuna-mtp-kiwi-pmd802x-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN + pmd802x"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 2>; }; diff --git a/qcom/tuna-mtp-nfc-overlay.dts b/qcom/tuna-mtp-nfc-overlay.dts index 440dcc09..9e5acb6f 100644 --- a/qcom/tuna-mtp-nfc-overlay.dts +++ b/qcom/tuna-mtp-nfc-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP + SN220/SN300 NFC"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 4>; }; diff --git a/qcom/tuna-mtp-overlay.dts b/qcom/tuna-mtp-overlay.dts index 006e66f8..21a67a97 100644 --- a/qcom/tuna-mtp-overlay.dts +++ b/qcom/tuna-mtp-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 0>; }; diff --git a/qcom/tuna-mtp-qmp1000-overlay.dts b/qcom/tuna-mtp-qmp1000-overlay.dts index 85d26b68..85add169 100644 --- a/qcom/tuna-mtp-qmp1000-overlay.dts +++ b/qcom/tuna-mtp-qmp1000-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <8 1>; }; diff --git a/qcom/tuna-qrd-overlay.dts b/qcom/tuna-qrd-overlay.dts index 8ee4d7ae..74ee86f0 100644 --- a/qcom/tuna-qrd-overlay.dts +++ b/qcom/tuna-qrd-overlay.dts @@ -14,6 +14,6 @@ model = "Qualcomm Technologies, Inc. Tuna QRD"; compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,tunap-qrd", "qcom,tunap", "qcom,qrd"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <11 0>; }; diff --git a/qcom/tuna-rcm-kiwi-overlay.dts b/qcom/tuna-rcm-kiwi-overlay.dts index 10c4409c..b71af0ea 100644 --- a/qcom/tuna-rcm-kiwi-overlay.dts +++ b/qcom/tuna-rcm-kiwi-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN"; compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,tunap-rcm", "qcom,tunap", "qcom,rcm"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <21 1>; }; diff --git a/qcom/tuna-rcm-overlay.dts b/qcom/tuna-rcm-overlay.dts index c47d003b..b80e2c2f 100644 --- a/qcom/tuna-rcm-overlay.dts +++ b/qcom/tuna-rcm-overlay.dts @@ -13,6 +13,6 @@ model = "Qualcomm Technologies, Inc. Tuna RCM"; compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,tunap-rcm", "qcom,tunap", "qcom,rcm"; - qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; qcom,board-id = <21 0>; }; diff --git a/qcom/tunap.dts b/qcom/tunap.dts new file mode 100644 index 00000000..d31edb8c --- /dev/null +++ b/qcom/tunap.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; + +#include "tunap.dtsi" +/ { + model = "Qualcomm Technologies, Inc. TunaP SoC"; + compatible = "qcom,tunap"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/tunap.dtsi b/qcom/tunap.dtsi new file mode 100644 index 00000000..beeb0ae8 --- /dev/null +++ b/qcom/tunap.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "tuna.dtsi" +/ { + model = "Qualcomm Technologies, Inc. TunaP SoC"; + compatible = "qcom,tunap"; + qcom,msm-id = <694 0x10000>; +};