Unverified Commit 896c59ed authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: rt1308-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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221123165432.594972-3-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d12f1061

sound/soc/codecs/rt1308-sdw.c

+11 −22
Original line number Diff line number Diff line
@@ -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) {