Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 467b061f authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: core: add support to snd_soc_dai_get_channel_map() 



On Qualcomm platforms, specifically with SLIMbus interfaced codecs,
the codec slim channel numbers are passed to DSP while configuring
the slim audio path. Having get_channel_map() would allow dais to
share such information across multiple dais.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a241c3d9

include/sound/soc-dai.h

+8 −0
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); 
int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,

			     int direction);





int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,

		unsigned int *tx_num, unsigned int *tx_slot,

		unsigned int *rx_num, unsigned int *rx_slot);



int snd_soc_dai_is_dummy(struct snd_soc_dai *dai);



struct snd_soc_dai_ops {
@@ -165,6 +170,9 @@ struct snd_soc_dai_ops { 
	int (*set_channel_map)(struct snd_soc_dai *dai,

		unsigned int tx_num, unsigned int *tx_slot,

		unsigned int rx_num, unsigned int *rx_slot);

	int (*get_channel_map)(struct snd_soc_dai *dai,

			unsigned int *tx_num, unsigned int *tx_slot,

			unsigned int *rx_num, unsigned int *rx_slot);

	int (*set_tristate)(struct snd_soc_dai *dai, int tristate);



	int (*set_sdw_stream)(struct snd_soc_dai *dai,

sound/soc/soc-core.c

+22 −0
Original line number Diff line number Diff line
@@ -2679,6 +2679,28 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai, 
}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map);



/**

 * snd_soc_dai_get_channel_map - Get DAI audio channel map

 * @dai: DAI

 * @tx_num: how many TX channels

 * @tx_slot: pointer to an array which imply the TX slot number channel

 *           0~num-1 uses

 * @rx_num: how many RX channels

 * @rx_slot: pointer to an array which imply the RX slot number channel

 *           0~num-1 uses

 */

int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,

	unsigned int *tx_num, unsigned int *tx_slot,

	unsigned int *rx_num, unsigned int *rx_slot)

{

	if (dai->driver->ops->get_channel_map)

		return dai->driver->ops->get_channel_map(dai, tx_num, tx_slot,

			rx_num, rx_slot);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_get_channel_map);



/**

 * snd_soc_dai_set_tristate - configure DAI system or master clock.

 * @dai: DAI