lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE
On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand
<mylene.josserand@free-electrons.com> wrote:
> 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: Mylène Josserand <mylene.josserand@free-electrons.com>
> ---
> sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++-----------------------
> 1 file changed, 21 insertions(+), 24 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
> index d60f6fbd36a2..107fa8213600 100644
> --- a/sound/soc/sunxi/sun8i-codec.c
> +++ b/sound/soc/sunxi/sun8i-codec.c
> @@ -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 ",

The extra space fixed in the next patch could be squashed into this
patch. Otherwise,

Acked-by: Chen-Yu Tsai <wens@csie.org>

> + "Digital Right DAC"},
> };
>
> static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
> --
> 2.11.0
>

\
 
 \ /
  Last update: 2017-03-20 12:49    [W:0.088 / U:2.220 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site