Unverified Commit 99ae8cf0 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: rt715: 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-8-ckeepax@opensource.cirrus.com


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

sound/soc/codecs/rt715-sdca.c

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