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

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

ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE 



Update the driver to use the new SOC_DAPM_DOUBLE definition
on the digital DAC mixer.
Update the names accordingly as, when they are shared, the
controls are not prefixed with the widget's name anymore.

Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4aa8146c

sound/soc/sunxi/sun8i-codec.c

+21 −24
Original line number Diff line number Diff line
@@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = {

	SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0),

	SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0),

	SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0),

	SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0),

};



static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = {

	SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC,

static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = {

	SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch",

			SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L,

			SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0),

	SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC,

	SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch",

			SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L,

			SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0),

	SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC,

	SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL,

			SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0),

	SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC,

	SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC,

			SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL,

			SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0),

};
@@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { 
			 SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),



	/* DAC Mixers */

	SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0,

			   sun8i_output_left_mixer_controls,

			   ARRAY_SIZE(sun8i_output_left_mixer_controls)),

	SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0,

			   sun8i_output_right_mixer_controls,

			   ARRAY_SIZE(sun8i_output_right_mixer_controls)),

	SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,

			   sun8i_dac_mixer_controls,

			   ARRAY_SIZE(sun8i_dac_mixer_controls)),

	SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0,

			   sun8i_dac_mixer_controls,

			   ARRAY_SIZE(sun8i_dac_mixer_controls)),



	/* Clocks */

	SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA,
@@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { 
	{ "Digital Right DAC", NULL, "DAC" },



	/* DAC Mixer Routes */

	{ "Left DAC Mixer", "LSlot 0", "Digital Left DAC"},

	{ "Right DAC Mixer", "RSlot 0", "Digital Right DAC"},

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

	  "Digital Left DAC"},

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

	  "Digital Right DAC"},

};



static struct snd_soc_dai_ops sun8i_codec_dai_ops = {