diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml index 6a736161d5aed..f4086787425ce 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml @@ -45,7 +45,8 @@ properties: - const: shutdown-ack iommus: - maxItems: 1 + minItems: 1 + maxItems: 3 power-domains: minItems: 1 diff --git a/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml b/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml index 1c0ea0f389e44..5bf078a005d1c 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml @@ -49,10 +49,6 @@ properties: required: - compatible -dependentRequired: - memory-region: - - qcom,vmid - additionalProperties: false examples: diff --git a/arch/arm64/boot/dts/qcom/lemans-el2.dtso b/arch/arm64/boot/dts/qcom/lemans-el2.dtso index 98153a06b4bbf..95cb8586b1068 100644 --- a/arch/arm64/boot/dts/qcom/lemans-el2.dtso +++ b/arch/arm64/boot/dts/qcom/lemans-el2.dtso @@ -26,7 +26,9 @@ * we need to configure it properly to use remote processor. */ &remoteproc_adsp { - iommus = <&apps_smmu 0x3000 0x0>; + iommus = <&apps_smmu 0x3000 0x0>, + <&apps_smmu 0x3060 0x9>, + <&apps_smmu 0x3062 0x1>; }; &remoteproc_cdsp0 { diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi index 63d269facff2c..8e62258ac14cd 100644 --- a/arch/arm64/boot/dts/qcom/lemans.dtsi +++ b/arch/arm64/boot/dts/qcom/lemans.dtsi @@ -804,6 +804,14 @@ #size-cells = <2>; ranges; + audio_cma_mem: qcom,audio-ml { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x1000000>; + }; + sail_ss_mem: sail-ss@80000000 { reg = <0x0 0x80000000 0x0 0x10000000>; no-map; @@ -7778,6 +7786,7 @@ q6apmdai: dais { compatible = "qcom,q6apm-dais"; iommus = <&apps_smmu 0x3001 0x0>; + memory-region = <&audio_cma_mem>; }; }; diff --git a/arch/arm64/boot/dts/qcom/monaco-el2.dtso b/arch/arm64/boot/dts/qcom/monaco-el2.dtso index 7cae65ae499c3..b3d009c95b440 100644 --- a/arch/arm64/boot/dts/qcom/monaco-el2.dtso +++ b/arch/arm64/boot/dts/qcom/monaco-el2.dtso @@ -20,7 +20,9 @@ }; &remoteproc_adsp { - iommus = <&apps_smmu 0x2000 0x0>; + iommus = <&apps_smmu 0x2000 0x0>, + <&apps_smmu 0x2060 0x9>, + <&apps_smmu 0x2062 0x1>; }; &remoteproc_cdsp { diff --git a/arch/arm64/boot/dts/qcom/monaco.dtsi b/arch/arm64/boot/dts/qcom/monaco.dtsi index b3c65d7e6ff7b..61f204adb1c35 100644 --- a/arch/arm64/boot/dts/qcom/monaco.dtsi +++ b/arch/arm64/boot/dts/qcom/monaco.dtsi @@ -789,6 +789,14 @@ #size-cells = <2>; ranges; + audio_cma_mem: qcom,audio-ml { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x1000000>; + }; + aop_image_mem: aop-image-region@90800000 { reg = <0x0 0x90800000 0x0 0x60000>; no-map; @@ -2851,6 +2859,7 @@ q6apmdai: dais { compatible = "qcom,q6apm-dais"; iommus = <&apps_smmu 0x2001 0x0>; + memory-region = <&audio_cma_mem>; }; };