ASoC: rt1316-sdw: Switch to new snd_sdw_params_to_config helper
The conversion from hw_params to SoundWire config is pretty standard as such most of the conversion can be handled by the new snd_sdw_params_to_config helper function. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20221123165432.594972-4-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
896c59edcd
Коммит
0725dd0461
|
@ -14,6 +14,7 @@
|
||||||
#include <sound/core.h>
|
#include <sound/core.h>
|
||||||
#include <sound/pcm.h>
|
#include <sound/pcm.h>
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
|
#include <sound/sdw.h>
|
||||||
#include <sound/soc-dapm.h>
|
#include <sound/soc-dapm.h>
|
||||||
#include <sound/initval.h>
|
#include <sound/initval.h>
|
||||||
#include "rt1316-sdw.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 snd_soc_component *component = dai->component;
|
||||||
struct rt1316_sdw_priv *rt1316 =
|
struct rt1316_sdw_priv *rt1316 =
|
||||||
snd_soc_component_get_drvdata(component);
|
snd_soc_component_get_drvdata(component);
|
||||||
struct sdw_stream_config stream_config;
|
struct sdw_stream_config stream_config = {0};
|
||||||
struct sdw_port_config port_config;
|
struct sdw_port_config port_config = {0};
|
||||||
enum sdw_data_direction direction;
|
|
||||||
struct sdw_stream_data *stream;
|
struct sdw_stream_data *stream;
|
||||||
int retval, port, num_channels, ch_mask;
|
int retval;
|
||||||
|
|
||||||
dev_dbg(dai->dev, "%s %s", __func__, dai->name);
|
dev_dbg(dai->dev, "%s %s", __func__, dai->name);
|
||||||
stream = snd_soc_dai_get_dma_data(dai, substream);
|
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;
|
return -EINVAL;
|
||||||
|
|
||||||
/* SoundWire specific configuration */
|
/* SoundWire specific configuration */
|
||||||
|
snd_sdw_params_to_config(substream, params, &stream_config, &port_config);
|
||||||
|
|
||||||
/* port 1 for playback */
|
/* port 1 for playback */
|
||||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||||
direction = SDW_DATA_DIR_RX;
|
port_config.num = 1;
|
||||||
port = 1;
|
else
|
||||||
} else {
|
port_config.num = 2;
|
||||||
direction = SDW_DATA_DIR_TX;
|
|
||||||
port = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
num_channels = params_channels(params);
|
|
||||||
ch_mask = (1 << num_channels) - 1;
|
|
||||||
|
|
||||||
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(rt1316->sdw_slave, &stream_config,
|
retval = sdw_stream_add_slave(rt1316->sdw_slave, &stream_config,
|
||||||
&port_config, 1, stream->sdw_stream);
|
&port_config, 1, stream->sdw_stream);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче