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

Commit 472df3cb authored by Barry Song's avatar Barry Song Committed by Mark Brown
Browse files

ASoC: Provide API for reordering channels 



The patch adds an interface to set the relationship between audio
channel number and slot number. The interface should be really useful
because audio channel n doesn't always use slot n in all platforms. And
for some devices, the relationship even can change with sound mode
switch in 2.1,3.1,4.1,5.1,6.1,7.1 etc.

Signed-off-by: default avatarBarry Song <21cnbao@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2312fd8f

include/sound/soc-dai.h

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt); 
int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,

	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width);



int snd_soc_dai_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 snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);



/* Digital Audio Interface mute */
@@ -148,6 +152,9 @@ struct snd_soc_dai_ops { 
	int (*set_tdm_slot)(struct snd_soc_dai *dai,

		unsigned int tx_mask, unsigned int rx_mask,

		int slots, int slot_width);

	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 (*set_tristate)(struct snd_soc_dai *dai, int tristate);



	/*

sound/soc/soc-core.c

+24 −0
Original line number Diff line number Diff line
@@ -2252,6 +2252,30 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, 
}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot);



/**

 * snd_soc_dai_set_channel_map - configure 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

 *

 * configure the relationship between channel number and TDM slot number.

 */

int snd_soc_dai_set_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->ops && dai->ops->set_channel_map)

		return dai->ops->set_channel_map(dai, tx_num, tx_slot,

			rx_num, rx_slot);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map);



/**

 * snd_soc_dai_set_tristate - configure DAI system or master clock.

 * @dai: DAI