|
@@ -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 */
|
|
|
SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
|
|
@@ -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 = {
|