sound: sdw: Add hw_params to SoundWire config helper function
Subsystems (3)
PATCH 1/9 sound: sdw: Add hw_params to SoundWire config helper function
The vast majority of the current users of the SoundWire framework have almost identical code for converting from hw_params to SoundWire configuration. Whilst complex devices might require more, it is very likely that most new devices will follow the same pattern. Save a little code by factoring this out into a helper function.
---
I was a little bit two minds about whether to make this an inline or not, so any thoughts on that would be super welcome. The function does very little, especially given that SNDRV_PCM_STREAM_PLAYBACK == SDW_DATA_DIR_RX so the if is also really just an assignment.
Thanks,
Charles
include/sound/sdw.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/sound/sdw.h
include/sound/sdw.h new file +49 -0
@@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* linux/sound/sdw.h -- SoundWire helpers for ALSA/ASoC +* +* Copyright (c) 2022 Cirrus Logic Inc. +* +* Author: Charles Keepax <[email protected]> +*/ + +#include <linux/soundwire/sdw.h> +#include <sound/asound.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> + +#ifndef __INCLUDE_SOUND_SDW_H +#define __INCLUDE_SOUND_SDW_H + +/** +* snd_sdw_params_to_config() - Conversion from hw_params to SoundWire config +* +* @substream: Pointer to the PCM substream structure +* @params: Pointer to the hardware params structure +* @stream_config: Stream configuration for the SoundWire audio stream +* @port_config: Port configuration for the SoundWire audio stream +* +* This function provides a basic conversion from the hw_params structure to +* SoundWire configuration structures. The user will at a minimum need to also +* set the port number in the port config, but may also override more of the +* setup, or in the case of a complex user, not use this helper at all and +* open-code everything. +*/ +static inline void snd_sdw_params_to_config (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct sdw_stream_config *stream_config, +struct sdw_port_config *port_config) +{ + stream_config->frame_rate =params_rate (params); + stream_config->ch_count =params_channels (params); + stream_config->bps =snd_pcm_format_width (params_format (params)); + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + stream_config->direction =SDW_DATA_DIR_RX ; +else + stream_config->direction =SDW_DATA_DIR_TX ; + + port_config->ch_mask =GENMASK (stream_config->ch_count -1 ,0 ); +} + +#endif
Signature · 1 line
2.30.2
PATCH 2/9 ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper
The conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/max98373-sdw.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)
sound/soc/codecs/max98373-sdw.c +11 -20
@@ -10,6 +10,7 @@#include <linux/slab.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/tlv.h> #include <linux/of.h>
@@ -533,10 +534,8 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct max98373_priv *max98373 =snd_soc_component_get_drvdata (component); - -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream;int ret, chan_sz, sampling_rate;
@@ -548,28 +547,20 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,if (!max98373->slave)return -EINVAL ; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; port_config.num =1 ; + +if (max98373->slot) { + stream_config.ch_count = max98373->slot; + port_config.ch_mask = max98373->rx_mask; + } }else { - direction =SDW_DATA_DIR_TX ; port_config.num =3 ; - } - stream_config.frame_rate =params_rate (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - -if (max98373->slot && direction ==SDW_DATA_DIR_RX ) { - stream_config.ch_count = max98373->slot; - port_config.ch_mask = max98373->rx_mask; - }else {/* only IV are supported by capture */ -if (direction ==SDW_DATA_DIR_TX ) - stream_config.ch_count =2 ; -else - stream_config.ch_count =params_channels (params); - + stream_config.ch_count =2 ; port_config.ch_mask =GENMASK ((int )stream_config.ch_count -1 ,0 ); }
Signature · 1 line
2.30.2
Re: [PATCH 2/9] ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper
Quoted 1 line · Charles Keepax
The conversation from
hw_paramsto SoundWire config is pretty
s/conversation/conversion
Quoted 53 lines
standard as such most of the conversation can be handled by the new
snd_sdw_params_to_confighelper function.Signed-off-by Charles Keepax <[email protected]>--- sound/soc/codecs/max98373-sdw.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)sound/soc/codecs/max98373-sdw.c +10
-8@@ -10,6 +10,7 @@#include <linux/slab.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/tlv.h> #include <linux/of.h> @@ -533,10 +534,8 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct max98373_priv *max98373 =snd_soc_component_get_drvdata (component); - -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream;int ret, chan_sz, sampling_rate;@@ -548,28 +547,20 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream,if (!max98373->slave)return -EINVAL ; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; port_config.num =1 ; + +if (max98373->slot) { + stream_config.ch_count = max98373->slot; + port_config.ch_mask = max98373->rx_mask; + } }else { - direction =SDW_DATA_DIR_TX ; port_config.num =3 ; - } - stream_config.frame_rate =params_rate (params);
sound/soc/codecs/max98373-sdw.c static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, · line 569
Quoted 10 lines
sound/soc/codecs/max98373-sdw.c +0
-9- stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - -if (max98373->slot && direction ==SDW_DATA_DIR_RX ) { - stream_config.ch_count = max98373->slot; - port_config.ch_mask = max98373->rx_mask; - }else {/* only IV are supported by capture */ -if (direction ==SDW_DATA_DIR_TX ) - stream_config.ch_count =2 ;
Has this special case gone missing or is it already guaranteed by the DAI config?
sound/soc/codecs/max98373-sdw.c static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, · line 564
Quoted 5 lines
sound/soc/codecs/max98373-sdw.c +1
-3-else - stream_config.ch_count =params_channels (params); - + stream_config.ch_count =2 ; port_config.ch_mask =GENMASK ((int )stream_config.ch_count -1 ,0 );
this is already done by snd_sdw_params_to_config()
Re: [PATCH 2/9] ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper
Quoted 4 lines · Richard Fitzgerald
Quoted 1 line · Charles Keepax
The conversation from
hw_paramsto SoundWire config is prettys/conversation/conversion
lol oops thanks for that will resend to fix that up its the whole series.
Quoted 17 lines
Quoted 17 lines
sound/soc/codecs/max98373-sdw.c +5
-8if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; port_config.num =1 ; + +if (max98373->slot) { + stream_config.ch_count = max98373->slot; + port_config.ch_mask = max98373->rx_mask; + } }else { - direction =SDW_DATA_DIR_TX ; port_config.num =3 ; - } - stream_config.frame_rate =params_rate (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - -if (max98373->slot && direction ==SDW_DATA_DIR_RX ) {
Quoted 9 lines
sound/soc/codecs/max98373-sdw.c static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, · line 569
Quoted 6 lines
sound/soc/codecs/max98373-sdw.c +0
-5- stream_config.ch_count = max98373->slot; - port_config.ch_mask = max98373->rx_mask; - }else {/* only IV are supported by capture */ -if (direction ==SDW_DATA_DIR_TX ) - stream_config.ch_count =2 ;Has this special case gone missing or is it already guaranteed by the DAI config?
This special case is still there, it is just below where you made your next comment. All this case equates to is if direction is TX/CAPTURE set the number of channels to 2.
Quoted 6 lines
sound/soc/codecs/max98373-sdw.c static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, · line 564
Quoted 5 lines
sound/soc/codecs/max98373-sdw.c +1
-3-else - stream_config.ch_count =params_channels (params); - + stream_config.ch_count =2 ; port_config.ch_mask =GENMASK ((int )stream_config.ch_count -1 ,0 );this is already done by
snd_sdw_params_to_config()
Not in this case because we just forced the channel count to 2, so we probably need to regenerate the mask too.
Thanks,
Charles
PATCH 3/9 ASoC: rt1308-sdw: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt1308-sdw.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)
sound/soc/codecs/rt1308-sdw.c +11 -22
@@ -17,6 +17,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -553,11 +554,10 @@ static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct rt1308_sdw_priv *rt1308 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels, ch_mask; +int retval;dev_dbg (dai->dev,"%s %s" , __func__, dai->name); stream =snd_soc_dai_get_dma_data (dai, substream);
@@ -569,30 +569,19 @@ static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +/* port 1 for playback */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =1 ; - }else { +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + port_config.num =1 ; +else return -EINVAL ; - }if (rt1308->slots) { - num_channels = rt1308->slots; - ch_mask = rt1308->rx_mask; - }else { - num_channels =params_channels (params); - ch_mask = (1 << num_channels) -1 ; + stream_config.ch_count = rt1308->slots; + port_config.ch_mask = rt1308->rx_mask; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count = num_channels; - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - port_config.ch_mask = ch_mask; - port_config.num = port; - retval =sdw_stream_add_slave (rt1308->sdw_slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
Signature · 1 line
2.30.2
PATCH 4/9 ASoC: rt1316-sdw: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt1316-sdw.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-)
sound/soc/codecs/rt1316-sdw.c +10 -22
@@ -14,6 +14,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc-dapm.h> #include <sound/initval.h> #include "rt1316-sdw.h"
@@ -530,11 +531,10 @@ static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct rt1316_sdw_priv *rt1316 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels, ch_mask; +int retval;dev_dbg (dai->dev,"%s %s" , __func__, dai->name); stream =snd_soc_dai_get_dma_data (dai, substream);
@@ -546,25 +546,13 @@ static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ -/* port 1 for playback */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =1 ; - }else { - direction =SDW_DATA_DIR_TX ; - port =2 ; - } - - num_channels =params_channels (params); - ch_mask = (1 << num_channels) -1 ; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); - stream_config.frame_rate =params_rate (params); - stream_config.ch_count = num_channels; - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - port_config.ch_mask = ch_mask; - port_config.num = port; +/* port 1 for playback */ +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + port_config.num =1 ; +else + port_config.num =2 ; retval =sdw_stream_add_slave (rt1316->sdw_slave, &stream_config, &port_config,1 , stream->sdw_stream);
Signature · 1 line
2.30.2
PATCH 5/9 ASoC: rt5682-sdw: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt5682-sdw.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
sound/soc/codecs/rt5682-sdw.c +9 -19
@@ -24,6 +24,7 @@#include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/jack.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -130,11 +131,10 @@ static int rt5682_sdw_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt5682_priv *rt5682 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int val_p =0 , val_c =0 , osr_p =0 , osr_c =0 ;dev_dbg (dai->dev,"%s %s" , __func__, dai->name);
@@ -147,22 +147,12 @@ static int rt5682_sdw_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =1 ; - }else { - direction =SDW_DATA_DIR_TX ; - port =2 ; - } +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask = (1 << (num_channels)) -1 ; - port_config.num = port; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + port_config.num =1 ; +else + port_config.num =2 ; retval =sdw_stream_add_slave (rt5682->slave, &stream_config, &port_config,1 , stream->sdw_stream);
Signature · 1 line
2.30.2
PATCH 6/9 ASoC: rt700: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt700.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
sound/soc/codecs/rt700.c +11 -21
@@ -19,6 +19,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -910,11 +911,10 @@ static int rt700_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt700_priv *rt700 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int val =0 ;dev_dbg (dai->dev,"%s %s" , __func__, dai->name);
@@ -927,35 +927,25 @@ static int rt700_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +/* This code assumes port 1 for playback and port 2 for capture */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =1 ; - }else { - direction =SDW_DATA_DIR_TX ; - port =2 ; - } +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + port_config.num =1 ; +else + port_config.num =2 ;switch (dai->id) {case RT700_AIF1 :break ;case RT700_AIF2 : - port +=2 ; + port_config.num +=2 ;break ;default :dev_err (component->dev,"Invalid DAI id %d\n" , dai->id);return -EINVAL ; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask = (1 << (num_channels)) -1 ; - port_config.num = port; - retval =sdw_stream_add_slave (rt700->slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
Signature · 1 line
2.30.2
PATCH 7/9 ASoC: rt711: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt711-sdca.c | 27 +++++++++------------------ sound/soc/codecs/rt711.c | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 36 deletions(-)
sound/soc/codecs/rt711-sdca.c +9 -18
@@ -18,6 +18,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc-dapm.h> #include <sound/initval.h> #include <sound/tlv.h>
@@ -1257,11 +1258,10 @@ static int rt711_sdca_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt711_sdca_priv *rt711 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int sampling_rate;dev_dbg (dai->dev,"%s %s" , __func__, dai->name);
@@ -1274,28 +1274,19 @@ static int rt711_sdca_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =3 ; + port_config.num =3 ; }else { - direction =SDW_DATA_DIR_TX ;if (dai->id ==RT711_AIF1 ) - port =2 ; + port_config.num =2 ;else if (dai->id ==RT711_AIF2 ) - port =4 ; + port_config.num =4 ;else return -EINVAL ; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask =GENMASK (num_channels -1 ,0 ); - port_config.num = port; - retval =sdw_stream_add_slave (rt711->slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
sound/soc/codecs/rt711.c +9 -18
@@ -19,6 +19,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -999,11 +1000,10 @@ static int rt711_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt711_priv *rt711 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int val =0 ;dev_dbg (dai->dev,"%s %s" , __func__, dai->name);
@@ -1016,28 +1016,19 @@ static int rt711_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =3 ; + port_config.num =3 ; }else { - direction =SDW_DATA_DIR_TX ;if (dai->id ==RT711_AIF1 ) - port =4 ; + port_config.num =4 ;else if (dai->id ==RT711_AIF2 ) - port =2 ; + port_config.num =2 ;else return -EINVAL ; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask = (1 << (num_channels)) -1 ; - port_config.num = port; - retval =sdw_stream_add_slave (rt711->slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
Signature · 1 line
2.30.2
PATCH 8/9 ASoC: rt715: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/rt715-sdca.c | 25 ++++++++----------------- sound/soc/codecs/rt715.c | 25 ++++++++----------------- 2 files changed, 16 insertions(+), 34 deletions(-)
sound/soc/codecs/rt715-sdca.c +8 -17
@@ -20,6 +20,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -820,11 +821,10 @@ static int rt715_sdca_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt715_sdca_priv *rt715 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct rt715_sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int val; stream =snd_soc_dai_get_dma_data (dai, substream);
@@ -835,16 +835,16 @@ static int rt715_sdca_pcm_hw_params(struct snd_pcm_substream *substream,if (!rt715->slave)return -EINVAL ; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +switch (dai->id) {case RT715_AIF1 : - direction =SDW_DATA_DIR_TX ; - port =6 ; + port_config.num =6 ;rt715_sdca_index_write (rt715,RT715_VENDOR_REG ,RT715_SDW_INPUT_SEL ,0xa500 );break ;case RT715_AIF2 : - direction =SDW_DATA_DIR_TX ; - port =4 ; + port_config.num =4 ;rt715_sdca_index_write (rt715,RT715_VENDOR_REG ,RT715_SDW_INPUT_SEL ,0xaf00 );break ;
@@ -853,15 +853,6 @@ static int rt715_sdca_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask =GENMASK (num_channels -1 ,0 ); - port_config.num = port; - retval =sdw_stream_add_slave (rt715->slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
sound/soc/codecs/rt715.c +8 -17
@@ -28,6 +28,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h>
@@ -801,11 +802,10 @@ static int rt715_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct rt715_priv *rt715 =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int retval, port, num_channels; +int retval;unsigned int val =0 ; stream =snd_soc_dai_get_dma_data (dai, substream);
@@ -816,15 +816,15 @@ static int rt715_pcm_hw_params(struct snd_pcm_substream *substream,if (!rt715->slave)return -EINVAL ; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); +switch (dai->id) {case RT715_AIF1 : - direction =SDW_DATA_DIR_TX ; - port =6 ; + port_config.num =6 ;rt715_index_write (rt715->regmap,RT715_SDW_INPUT_SEL ,0xa500 );break ;case RT715_AIF2 : - direction =SDW_DATA_DIR_TX ; - port =4 ; + port_config.num =4 ;rt715_index_write (rt715->regmap,RT715_SDW_INPUT_SEL ,0xa000 );break ;default :
@@ -832,15 +832,6 @@ static int rt715_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; - - num_channels =params_channels (params); - port_config.ch_mask = (1 << (num_channels)) -1 ; - port_config.num = port; - retval =sdw_stream_add_slave (rt715->slave, &stream_config, &port_config,1 , stream->sdw_stream);if (retval) {
Signature · 1 line
2.30.2
PATCH 9/9 ASoC: sdw-mockup: Switch to new snd_sdw_params_to_config helper
In reply to Charles KeepaxThe conversation from hw_params to SoundWire config is pretty standard as such most of the conversation can be handled by the new snd_sdw_params_to_config helper function.
--- sound/soc/codecs/sdw-mockup.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
sound/soc/codecs/sdw-mockup.c +8 -20
@@ -16,6 +16,7 @@#include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <sound/sdw.h> #include <sound/soc.h> struct sdw_mockup_priv {
@@ -80,12 +81,9 @@ static int sdw_mockup_pcm_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_component *component = dai->component;struct sdw_mockup_priv *sdw_mockup =snd_soc_component_get_drvdata (component); -struct sdw_stream_config stream_config; -struct sdw_port_config port_config; -enum sdw_data_direction direction; +struct sdw_stream_config stream_config = {0 }; +struct sdw_port_config port_config = {0 };struct sdw_stream_data *stream; -int num_channels; -int port;int ret; stream =snd_soc_dai_get_dma_data (dai, substream);
@@ -96,22 +94,12 @@ static int sdw_mockup_pcm_hw_params(struct snd_pcm_substream *substream,return -EINVAL ;/* SoundWire specific configuration */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - direction =SDW_DATA_DIR_RX ; - port =1 ; - }else { - direction =SDW_DATA_DIR_TX ; - port =8 ; - } - - stream_config.frame_rate =params_rate (params); - stream_config.ch_count =params_channels (params); - stream_config.bps =snd_pcm_format_width (params_format (params)); - stream_config.direction = direction; +snd_sdw_params_to_config (substream, params, &stream_config, &port_config); - num_channels =params_channels (params); - port_config.ch_mask = (1 << num_channels) -1 ; - port_config.num = port; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + port_config.num =1 ; +else + port_config.num =8 ; ret =sdw_stream_add_slave (sdw_mockup->slave, &stream_config, &port_config,1 , stream->sdw_stream);
Signature · 1 line
2.30.2