Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1603734 > unrolled thread
| Started by | Mylène Josserand <mylene.josserand@free-electrons.com> |
|---|---|
| First post | 2017-03-18 09:00 +0100 |
| Last post | 2017-03-20 13:00 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-03-18 09:00 +0100
Re: [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Chen-Yu Tsai <wens@csie.org> - 2017-03-20 13:00 +0100
| From | Mylène Josserand <mylene.josserand@free-electrons.com> |
|---|---|
| Date | 2017-03-18 09:00 +0100 |
| Subject | [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN |
| Message-ID | <tmhrj-30E-1@gated-at.bofh.it> |
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: Mylène Josserand <mylene.josserand@free-electrons.com>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index adb13fbd2006..7527ba29a5a0 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -281,11 +281,13 @@ 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,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
- SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
+ /* 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_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
/* DAC Mixers */
SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
@@ -331,14 +333,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 = {
--
2.11.0
[toc] | [next] | [standalone]
| From | Chen-Yu Tsai <wens@csie.org> |
|---|---|
| Date | 2017-03-20 13:00 +0100 |
| Message-ID | <tn48G-4dt-11@gated-at.bofh.it> |
| In reply to | #1603734 |
On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand
<mylene.josserand@free-electrons.com> wrote:
> 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: Mylène Josserand <mylene.josserand@free-electrons.com>
> ---
> sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
> index adb13fbd2006..7527ba29a5a0 100644
> --- a/sound/soc/sunxi/sun8i-codec.c
> +++ b/sound/soc/sunxi/sun8i-codec.c
[...]
> @@ -331,14 +333,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" },
Nit on the order (should be left before right), but otherwise
Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> /* 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 = {
> --
> 2.11.0
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web