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

Commit 9a532f05 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

parents 10e5b9c2 8a70b454

Documentation/sound/soc/dapm.rst

+18 −0
Original line number Diff line number Diff line
@@ -105,6 +105,24 @@ Pre 
	Special PRE widget (exec before all others)

Post

	Special POST widget (exec after all others)

Buffer

	Inter widget audio data buffer within a DSP.

Scheduler

	DSP internal scheduler that schedules component/pipeline processing

	work.

Effect

	Widget that performs an audio processing effect.

SRC

	Sample Rate Converter within DSP or CODEC

ASRC

	Asynchronous Sample Rate Converter within DSP or CODEC

Encoder

	Widget that encodes audio data from one format (usually PCM) to another

	usually more compressed format.

Decoder

	Widget that decodes audio data from a compressed format to an

	uncompressed format like PCM.





(Widgets are defined in include/sound/soc-dapm.h)

include/sound/soc-dapm.h

+7 −0
Original line number Diff line number Diff line
@@ -510,6 +510,13 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_dai_out,

	snd_soc_dapm_dai_link,		/* link between two DAI structures */

	snd_soc_dapm_kcontrol,		/* Auto-disabled kcontrol */

	snd_soc_dapm_buffer,		/* DSP/CODEC internal buffer */

	snd_soc_dapm_scheduler,		/* DSP/CODEC internal scheduler */

	snd_soc_dapm_effect,		/* DSP/CODEC effect component */

	snd_soc_dapm_src,		/* DSP/CODEC SRC component */

	snd_soc_dapm_asrc,		/* DSP/CODEC ASRC component */

	snd_soc_dapm_encoder,		/* FW/SW audio encoder component */

	snd_soc_dapm_decoder,		/* FW/SW audio decoder component */

};



enum snd_soc_dapm_subclass {

include/uapi/sound/asoc.h

+9 −1
Original line number Diff line number Diff line
@@ -73,7 +73,15 @@ 
#define SND_SOC_TPLG_DAPM_DAI_IN	13

#define SND_SOC_TPLG_DAPM_DAI_OUT	14

#define SND_SOC_TPLG_DAPM_DAI_LINK	15

#define SND_SOC_TPLG_DAPM_LAST		SND_SOC_TPLG_DAPM_DAI_LINK

#define SND_SOC_TPLG_DAPM_BUFFER	16

#define SND_SOC_TPLG_DAPM_SCHEDULER	17

#define SND_SOC_TPLG_DAPM_EFFECT	18

#define SND_SOC_TPLG_DAPM_SIGGEN	19

#define SND_SOC_TPLG_DAPM_SRC		20

#define SND_SOC_TPLG_DAPM_ASRC		21

#define SND_SOC_TPLG_DAPM_ENCODER	22

#define SND_SOC_TPLG_DAPM_DECODER	23

#define SND_SOC_TPLG_DAPM_LAST		SND_SOC_TPLG_DAPM_DECODER



/* Header magic number and string sizes */

#define SND_SOC_TPLG_MAGIC		0x41536F43 /* ASoC */

sound/soc/soc-topology.c

+8 −0
Original line number Diff line number Diff line
@@ -242,6 +242,14 @@ static const struct soc_tplg_map dapm_map[] = { 
	{SND_SOC_TPLG_DAPM_DAI_IN, snd_soc_dapm_dai_in},

	{SND_SOC_TPLG_DAPM_DAI_OUT, snd_soc_dapm_dai_out},

	{SND_SOC_TPLG_DAPM_DAI_LINK, snd_soc_dapm_dai_link},

	{SND_SOC_TPLG_DAPM_BUFFER, snd_soc_dapm_buffer},

	{SND_SOC_TPLG_DAPM_SCHEDULER, snd_soc_dapm_scheduler},

	{SND_SOC_TPLG_DAPM_EFFECT, snd_soc_dapm_effect},

	{SND_SOC_TPLG_DAPM_SIGGEN, snd_soc_dapm_siggen},

	{SND_SOC_TPLG_DAPM_SRC, snd_soc_dapm_src},

	{SND_SOC_TPLG_DAPM_ASRC, snd_soc_dapm_asrc},

	{SND_SOC_TPLG_DAPM_ENCODER, snd_soc_dapm_encoder},

	{SND_SOC_TPLG_DAPM_DECODER, snd_soc_dapm_decoder},

};



static int tplc_chan_get_reg(struct soc_tplg *tplg,