diff options
| -rw-r--r-- | sound/soc/sunxi/sun8i-codec.c | 20 |
1 files 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[] = { | |||
| 281 | SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, | 281 | SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, |
| 282 | 0, NULL, 0), | 282 | 0, NULL, 0), |
| 283 | 283 | ||
| 284 | /* Analog DAC */ | 284 | /* Analog DAC AIF */ |
| 285 | SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, | 285 | SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, |
| 286 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), | 286 | SUN8I_AIF1_DACDAT_CTRL, |
| 287 | SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, | 287 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), |
| 288 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), | 288 | SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, |
| 289 | SUN8I_AIF1_DACDAT_CTRL, | ||
| 290 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), | ||
| 289 | 291 | ||
| 290 | /* DAC Mixers */ | 292 | /* DAC Mixers */ |
| 291 | SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, | 293 | 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[] = { | |||
| 331 | { "DAC", NULL, "MODCLK DAC" }, | 333 | { "DAC", NULL, "MODCLK DAC" }, |
| 332 | 334 | ||
| 333 | /* DAC Routes */ | 335 | /* DAC Routes */ |
| 334 | { "Digital Left DAC", NULL, "DAC" }, | 336 | { "AIF1 Slot 0 Right", NULL, "DAC" }, |
| 335 | { "Digital Right DAC", NULL, "DAC" }, | 337 | { "AIF1 Slot 0 Left", NULL, "DAC" }, |
| 336 | 338 | ||
| 337 | /* DAC Mixer Routes */ | 339 | /* DAC Mixer Routes */ |
| 338 | { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", | 340 | { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", |
| 339 | "Digital Left DAC"}, | 341 | "AIF1 Slot 0 Left"}, |
| 340 | { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", | 342 | { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", |
| 341 | "Digital Right DAC"}, | 343 | "AIF1 Slot 0 Right"}, |
| 342 | }; | 344 | }; |
| 343 | 345 | ||
| 344 | static struct snd_soc_dai_ops sun8i_codec_dai_ops = { | 346 | static struct snd_soc_dai_ops sun8i_codec_dai_ops = { |
