Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ properties:
- const: shutdown-ack

iommus:
maxItems: 1
minItems: 1
maxItems: 3

power-domains:
minItems: 1
Expand Down
4 changes: 0 additions & 4 deletions Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ properties:
required:
- compatible

dependentRequired:
memory-region:
- qcom,vmid

additionalProperties: false

examples:
Expand Down
4 changes: 3 additions & 1 deletion arch/arm64/boot/dts/qcom/lemans-el2.dtso
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/qcom/lemans.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -7778,6 +7786,7 @@
q6apmdai: dais {
compatible = "qcom,q6apm-dais";
iommus = <&apps_smmu 0x3001 0x0>;
memory-region = <&audio_cma_mem>;
};
};

Expand Down
4 changes: 3 additions & 1 deletion arch/arm64/boot/dts/qcom/monaco-el2.dtso
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/qcom/monaco.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2851,6 +2859,7 @@
q6apmdai: dais {
compatible = "qcom,q6apm-dais";
iommus = <&apps_smmu 0x2001 0x0>;
memory-region = <&audio_cma_mem>;
};
};

Expand Down