| Message ID | 20210607152836.17154-13-srinivas.kandagatla@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: qcom: Add AudioReach support | expand |
On Mon, 07 Jun 2021 16:28:35 +0100, Srinivas Kandagatla wrote: > Add compatible strings for AudioReach DSP firmware based soundcards. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > .../bindings/sound/qcom,sm8250.yaml | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:5: warning: "MSM_FRONTEND_DAI_MULTIMEDIA1" redefined 5 | #define MSM_FRONTEND_DAI_MULTIMEDIA1 1 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:5: note: this is the location of the previous definition 5 | #define MSM_FRONTEND_DAI_MULTIMEDIA1 0 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:6: warning: "MSM_FRONTEND_DAI_MULTIMEDIA2" redefined 6 | #define MSM_FRONTEND_DAI_MULTIMEDIA2 2 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:6: note: this is the location of the previous definition 6 | #define MSM_FRONTEND_DAI_MULTIMEDIA2 1 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:7: warning: "MSM_FRONTEND_DAI_MULTIMEDIA3" redefined 7 | #define MSM_FRONTEND_DAI_MULTIMEDIA3 3 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:7: note: this is the location of the previous definition 7 | #define MSM_FRONTEND_DAI_MULTIMEDIA3 2 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:8: warning: "MSM_FRONTEND_DAI_MULTIMEDIA4" redefined 8 | #define MSM_FRONTEND_DAI_MULTIMEDIA4 4 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:8: note: this is the location of the previous definition 8 | #define MSM_FRONTEND_DAI_MULTIMEDIA4 3 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:9: warning: "MSM_FRONTEND_DAI_MULTIMEDIA5" redefined 9 | #define MSM_FRONTEND_DAI_MULTIMEDIA5 5 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:9: note: this is the location of the previous definition 9 | #define MSM_FRONTEND_DAI_MULTIMEDIA5 4 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:10: warning: "MSM_FRONTEND_DAI_MULTIMEDIA6" redefined 10 | #define MSM_FRONTEND_DAI_MULTIMEDIA6 6 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:10: note: this is the location of the previous definition 10 | #define MSM_FRONTEND_DAI_MULTIMEDIA6 5 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:11: warning: "MSM_FRONTEND_DAI_MULTIMEDIA7" redefined 11 | #define MSM_FRONTEND_DAI_MULTIMEDIA7 7 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:11: note: this is the location of the previous definition 11 | #define MSM_FRONTEND_DAI_MULTIMEDIA7 6 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:116: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6apm.h:12: warning: "MSM_FRONTEND_DAI_MULTIMEDIA8" redefined 12 | #define MSM_FRONTEND_DAI_MULTIMEDIA8 8 | In file included from Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:20: ./scripts/dtc/include-prefixes/dt-bindings/sound/qcom,q6asm.h:12: note: this is the location of the previous definition 12 | #define MSM_FRONTEND_DAI_MULTIMEDIA8 7 | Error: Documentation/devicetree/bindings/sound/qcom,sm8250.example.dts:154.5-6 syntax error FATAL ERROR: Unable to parse input tree make[1]: *** [scripts/Makefile.lib:380: Documentation/devicetree/bindings/sound/qcom,sm8250.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1416: dt_binding_check] Error 2 \ndoc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1488759 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit.
diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml index 72ad9ab91832..551f4fe04749 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml @@ -18,6 +18,8 @@ properties: oneOf: - const: qcom,sm8250-sndcard - const: qcom,qrb5165-rb5-sndcard + - const: qcom,sm8250-audioreach-sndcard + - const: qcom,qrb5165-rb5-audioreach-sndcard audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array @@ -157,3 +159,44 @@ examples: }; }; }; +#--------------------------- +# AudioReach based dai links +#--------------------------- + - | + #include <dt-bindings/sound/qcom,q6apm.h> + sound { + compatible = "qcom,qrb5165-rb5-audioreach-sndcard"; + model = "Qualcomm-qrb5165-RB5-WSA8815-Speakers-DMIC0"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT"; + + wsa-dai-link { + link-name = "WSA Playback"; + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&wsamacro>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + cpu { + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + + codec { + sound-dai = <&vamacro 0>; + }; + }; + }
Add compatible strings for AudioReach DSP firmware based soundcards. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- .../bindings/sound/qcom,sm8250.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+)