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

Commit 9123aa86 authored by Mylène Josserand's avatar Mylène Josserand Committed by Mark Brown
Browse files

ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN 



Update the driver to use SND_SOC_DAPM_AIF_IN instead of
SND_SOC_DAPM_DAC.
Rename the interface's widgets to be more precise on which slot
the interface is connected.

Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 80405d44

sound/soc/sunxi/sun8i-codec.c

+11 −9
Original line number Diff line number Diff line
@@ -281,10 +281,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,

			    0, NULL, 0),



	/* Analog DAC */

	SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,

	/* Analog DAC AIF */

	SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,

			    SUN8I_AIF1_DACDAT_CTRL,

			    SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),

	SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,

	SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,

			    SUN8I_AIF1_DACDAT_CTRL,

			    SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),



	/* DAC Mixers */
@@ -329,14 +331,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { 
	{ "DAC", NULL, "MODCLK DAC" },



	/* DAC Routes */

	{ "Digital Left DAC", NULL, "DAC" },

	{ "Digital Right DAC", NULL, "DAC" },

	{ "AIF1 Slot 0 Right", NULL, "DAC" },

	{ "AIF1 Slot 0 Left", NULL, "DAC" },



	/* DAC Mixer Routes */

	{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",

	  "Digital Left DAC"},

	  "AIF1 Slot 0 Left"},

	{ "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",

	  "Digital Right DAC"},

	  "AIF1 Slot 0 Right"},

};



static struct snd_soc_dai_ops sun8i_codec_dai_ops = {