Merge 4ba1773deb on remote branch

Change-Id: Ic668811f1944f9bbdac33f9236aefba7fca23495
This commit is contained in:
Linux Build Service Account
2024-12-12 23:49:16 -08:00
3 changed files with 12 additions and 4 deletions

8
Kbuild
View File

@@ -26,6 +26,14 @@ dtbo-y += tuna/tuna-dsp.dtbo
endif endif
endif endif
ifeq ($(CONFIG_ARCH_KERA), y)
ifeq ($(CONFIG_ARCH_QTI_VM), y)
dtbo-y += kera/kera-dsp-trustedvm.dtbo
else
dtbo-y += kera/kera-dsp.dtbo
endif
endif
ifeq ($(CONFIG_ARCH_MONACO), y) ifeq ($(CONFIG_ARCH_MONACO), y)
dtbo-y += monaco/monaco-dsp.dtbo dtbo-y += monaco/monaco-dsp.dtbo
endif endif

View File

@@ -2,7 +2,7 @@
qcom,fastrpc { qcom,fastrpc {
compatible = "qcom,fastrpc"; compatible = "qcom,fastrpc";
qcom,glink-channels = "fastrpcglink-apps-dsp"; qcom,glink-channels = "fastrpcglink-apps-dsp";
qcom,intents = <0x64 64>; qcom,intents = <0x181 64>;
label = "adsp"; label = "adsp";
memory-region = <&adsp_mem_heap>; memory-region = <&adsp_mem_heap>;
qcom,vmids = <22 37>; qcom,vmids = <22 37>;
@@ -83,7 +83,7 @@
qcom,fastrpc { qcom,fastrpc {
compatible = "qcom,fastrpc"; compatible = "qcom,fastrpc";
qcom,glink-channels = "fastrpcglink-apps-dsp"; qcom,glink-channels = "fastrpcglink-apps-dsp";
qcom,intents = <0x64 64>; qcom,intents = <0x3fA 64>;
label = "cdsp"; label = "cdsp";
qcom,fastrpc-gids = <2908>; qcom,fastrpc-gids = <2908>;
qcom,rpc-latency-us = <235>; qcom,rpc-latency-us = <235>;

View File

@@ -11,6 +11,6 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna v1 SoC"; model = "Qualcomm Technologies, Inc. Tuna v1 SoC";
compatible = "qcom,tuna"; compatible = "qcom,tuna";
qcom,msm-id = <655 0x10000>, <681 0x10000>; qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <0 0>; qcom,board-id = <0 0>;
}; };