| Message ID | 20211202145505.58852-1-stephan@gerhold.net |
|---|---|
| Headers | show |
| Series | ASoC: qcom: apq8016_sbc: Allow routing audio through QDSP6 | expand |
Hi Stephan, On 02/12/2021 14:55, Stephan Gerhold wrote: > This series makes it possible to route audio through the combined > audio/modem DSP on MSM8916/APQ8016 devices instead of bypassing it using > the LPASS drivers. This is necessary to support certain functionality such > as voice call audio. See PATCH 4/5 for details. > > Also, qcom,apq8016-sbc.txt is converted to DT schema by adding it to the > existing qcom,sm8250.yaml. The bindings are similar enough that it is easier > to share a single schema instead of duplicating everything into multiple ones. Yes this is really a good start, we should at some point in time move to a common yaml file, currently most of the dsp based dt-bindings very simillar, except some codec specific routings. > > Stephan Gerhold (5): > ASoC: dt-bindings: qcom: sm8250: Drop redundant MultiMedia routes > ASoC: dt-bindings: qcom: sm8250: Document "aux-devs" > ASoC: dt-bindings: qcom: apq8016-sbc: Move to qcom,sm8250 DT schema > ASoC: dt-bindings: qcom: Document qcom,msm8916-qdsp6-sndcard > compatible > ASoC: qcom: apq8016_sbc: Allow routing audio through QDSP6 > --srini > .../bindings/sound/qcom,apq8016-sbc.txt | 96 ------------- > .../bindings/sound/qcom,sm8250.yaml | 136 +++++++++++++++++- > sound/soc/qcom/apq8016_sbc.c | 134 ++++++++++++++++- > 3 files changed, 259 insertions(+), 107 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt >
On Thu, 02 Dec 2021 15:55:01 +0100, Stephan Gerhold wrote: > The MultiMedia audio routes can be deduced from other parts of the > device tree (e.g. the definitions of the MultiMedia DAIs) and therefore > specifying them again in "audio-routing" is redundant and prone to > mistakes. This is no longer necessary since commit 6fd8d2d275f7 > ("ASoC: qcom: qdsp6: Move frontend AIFs to q6asm-dai"). > > Let's drop them from the example in the DT schema as well > to avoid confusion. > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > Documentation/devicetree/bindings/sound/qcom,sm8250.yaml | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > Acked-by: Rob Herring <robh@kernel.org>
On Thu, 02 Dec 2021 15:55:03 +0100, Stephan Gerhold wrote: > All the Qualcomm sound card drivers use the same common device tree > parsing code, so the allowed device tree nodes are almost the same > for all of them. Convert the qcom,apq8016-sbc-sndcard documentation > to a DT schema by adding it to the existing qcom,sm8250 schema. > > The only speciality of qcom,apq8016-sbc-sndcard is that it has memory > resources for setting up an I/O mux. This can be handled using > a conditional if statement that only requires it for the apq8016-sbc > compatible. > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > Note: There will be a dtbs_check warning caused by this, because the > recommended naming for nodes is different in this DT schema (-dai-link > suffix). I will address this in a separate patch if this series is > accepted, simply by changing apq8016-sbc.dts to the example added > in this patch. The driver itself accepts any naming for those nodes. > --- > .../bindings/sound/qcom,apq8016-sbc.txt | 96 ------------------- > .../bindings/sound/qcom,sm8250.yaml | 83 +++++++++++++++- > 2 files changed, 81 insertions(+), 98 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt > Reviewed-by: Rob Herring <robh@kernel.org>
On Thu, 02 Dec 2021 15:55:04 +0100, Stephan Gerhold wrote: > There are two possible audio setups on MSM8916/APQ8016: Normally the audio > is routed through the audio/modem DSP (covered by the qdsp6 driver). During > upstreaming for the DragonBoard 410c it was decided to bypass it and > instead talk directly to the audio controller using the "lpass" driver. > > Bypassing the DSP gives more control about the audio configuration but limits > the functionality: For example, routing audio through the audio/modem DSP is > strictly required for voice call audio. Also, without the special changes in > the DB410c firmware other MSM8916 devices can only use the bypass as long as > the modem DSP is not started. Otherwise, the firmware will assume control of > the LPASS hardware block and audio is no longer functional. > > Add support for using the DSP audio setup instead using a new > "qcom,msm8916-qdsp6-sndcard" compatible. It is basically a mixture of > the apq8016-sbc-sndcard and the newer sm8250-sndcard, which uses > indirect QDSP6 DAI links instead of the direct LPASS DAI links. > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > .../bindings/sound/qcom,sm8250.yaml | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > Reviewed-by: Rob Herring <robh@kernel.org>
On Thu, 2 Dec 2021 15:55:00 +0100, Stephan Gerhold wrote: > This series makes it possible to route audio through the combined > audio/modem DSP on MSM8916/APQ8016 devices instead of bypassing it using > the LPASS drivers. This is necessary to support certain functionality such > as voice call audio. See PATCH 4/5 for details. > > Also, qcom,apq8016-sbc.txt is converted to DT schema by adding it to the > existing qcom,sm8250.yaml. The bindings are similar enough that it is easier > to share a single schema instead of duplicating everything into multiple ones. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/5] ASoC: dt-bindings: qcom: sm8250: Drop redundant MultiMedia routes commit: c55676ec292e0ff83261eb61efaf99a91079a3b8 [2/5] ASoC: dt-bindings: qcom: sm8250: Document "aux-devs" commit: 1875ae76f82c5c9acd7b7f44bd9226fbcbe858b7 [3/5] ASoC: dt-bindings: qcom: apq8016-sbc: Move to qcom,sm8250 DT schema commit: b7875d88bf70100d2fe0dc08072018f994ccd6c4 [4/5] ASoC: dt-bindings: qcom: Document qcom,msm8916-qdsp6-sndcard compatible commit: 38192dc36f1fe1615b7a12cc78b9354d6b4ba8b7 [5/5] ASoC: qcom: apq8016_sbc: Allow routing audio through QDSP6 commit: 190357e1e09f271566e91fcd108c161f7e25a253 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
This series makes it possible to route audio through the combined audio/modem DSP on MSM8916/APQ8016 devices instead of bypassing it using the LPASS drivers. This is necessary to support certain functionality such as voice call audio. See PATCH 4/5 for details. Also, qcom,apq8016-sbc.txt is converted to DT schema by adding it to the existing qcom,sm8250.yaml. The bindings are similar enough that it is easier to share a single schema instead of duplicating everything into multiple ones. Stephan Gerhold (5): ASoC: dt-bindings: qcom: sm8250: Drop redundant MultiMedia routes ASoC: dt-bindings: qcom: sm8250: Document "aux-devs" ASoC: dt-bindings: qcom: apq8016-sbc: Move to qcom,sm8250 DT schema ASoC: dt-bindings: qcom: Document qcom,msm8916-qdsp6-sndcard compatible ASoC: qcom: apq8016_sbc: Allow routing audio through QDSP6 .../bindings/sound/qcom,apq8016-sbc.txt | 96 ------------- .../bindings/sound/qcom,sm8250.yaml | 136 +++++++++++++++++- sound/soc/qcom/apq8016_sbc.c | 134 ++++++++++++++++- 3 files changed, 259 insertions(+), 107 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt