Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: dt-bindings: qcom,q6asm: Split to separate schema

The APR/GPR bindings with services got complicated so move out the Q6ASM
service to its own binding. Previously the compatible was documented in
qcom,apr.yaml. Move most of the examples from its children to this new
file.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20221115120235.167812-8-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Mark Brown
83c8fa5e f26a776e

+82 -30
+14 -30
Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml
··· 73 73 74 74 examples: 75 75 - | 76 - #include <dt-bindings/soc/qcom,apr.h> 77 - #include <dt-bindings/sound/qcom,q6asm.h> 78 - 79 - apr { 80 - compatible = "qcom,apr-v2"; 81 - qcom,domain = <APR_DOMAIN_ADSP>; 76 + dais { 77 + compatible = "qcom,q6asm-dais"; 78 + iommus = <&apps_smmu 0x1821 0x0>; 82 79 #address-cells = <1>; 83 80 #size-cells = <0>; 81 + #sound-dai-cells = <1>; 84 82 85 - service@7 { 86 - compatible = "qcom,q6asm"; 87 - reg = <APR_SVC_ASM>; 88 - qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; 83 + dai@0 { 84 + reg = <0>; 85 + }; 89 86 90 - dais { 91 - compatible = "qcom,q6asm-dais"; 92 - iommus = <&apps_smmu 0x1821 0x0>; 93 - #address-cells = <1>; 94 - #size-cells = <0>; 95 - #sound-dai-cells = <1>; 87 + dai@1 { 88 + reg = <1>; 89 + }; 96 90 97 - dai@0 { 98 - reg = <0>; 99 - }; 100 - 101 - dai@1 { 102 - reg = <1>; 103 - }; 104 - 105 - dai@2 { 106 - reg = <2>; 107 - is-compress-dai; 108 - direction = <1>; 109 - }; 110 - }; 91 + dai@2 { 92 + reg = <2>; 93 + is-compress-dai; 94 + direction = <1>; 111 95 }; 112 96 };
+68
Documentation/devicetree/bindings/sound/qcom,q6asm.yaml
··· 1 + # SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/sound/qcom,q6asm.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Qualcomm Audio Stream Manager (Q6ASM) 8 + 9 + maintainers: 10 + - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 11 + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> 12 + 13 + allOf: 14 + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# 15 + 16 + properties: 17 + compatible: 18 + enum: 19 + - qcom,q6asm 20 + 21 + dais: 22 + type: object 23 + $ref: /schemas/sound/qcom,q6asm-dais.yaml# 24 + unevaluatedProperties: false 25 + description: Qualcomm DSP audio ports 26 + 27 + required: 28 + - compatible 29 + - dais 30 + 31 + unevaluatedProperties: false 32 + 33 + examples: 34 + - | 35 + #include <dt-bindings/soc/qcom,apr.h> 36 + 37 + apr { 38 + #address-cells = <1>; 39 + #size-cells = <0>; 40 + 41 + service@7 { 42 + compatible = "qcom,q6asm"; 43 + reg = <APR_SVC_ASM>; 44 + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; 45 + 46 + dais { 47 + compatible = "qcom,q6asm-dais"; 48 + iommus = <&apps_smmu 0x1821 0x0>; 49 + #address-cells = <1>; 50 + #size-cells = <0>; 51 + #sound-dai-cells = <1>; 52 + 53 + dai@0 { 54 + reg = <0>; 55 + }; 56 + 57 + dai@1 { 58 + reg = <1>; 59 + }; 60 + 61 + dai@2 { 62 + reg = <2>; 63 + is-compress-dai; 64 + direction = <1>; 65 + }; 66 + }; 67 + }; 68 + };