]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: wm9081: Hook DAC up via DAPM rather than stream
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 May 2012 11:12:23 +0000 (12:12 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 May 2012 11:29:18 +0000 (12:29 +0100)
More current API usage.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm9081.c

index 076c126ed9b1812b63cc186138859a43832a8b9e..9328270df16cfcc91cb758b65effa6c9607ea9c3 100644 (file)
@@ -774,7 +774,7 @@ static const struct snd_soc_dapm_widget wm9081_dapm_widgets[] = {
 SND_SOC_DAPM_INPUT("IN1"),
 SND_SOC_DAPM_INPUT("IN2"),
 
-SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM9081_POWER_MANAGEMENT, 0, 0),
+SND_SOC_DAPM_DAC("DAC", NULL, WM9081_POWER_MANAGEMENT, 0, 0),
 
 SND_SOC_DAPM_MIXER_NAMED_CTL("Mixer", SND_SOC_NOPM, 0, 0,
                             mixer, ARRAY_SIZE(mixer)),
@@ -799,6 +799,7 @@ SND_SOC_DAPM_SUPPLY("TSENSE", WM9081_POWER_MANAGEMENT, 7, 0, NULL, 0),
 static const struct snd_soc_dapm_route wm9081_audio_paths[] = {
        { "DAC", NULL, "CLK_SYS" },
        { "DAC", NULL, "CLK_DSP" },
+       { "DAC", NULL, "AIF" },
 
        { "Mixer", "IN1 Switch", "IN1" },
        { "Mixer", "IN2 Switch", "IN2" },
@@ -1252,7 +1253,7 @@ static const struct snd_soc_dai_ops wm9081_dai_ops = {
 static struct snd_soc_dai_driver wm9081_dai = {
        .name = "wm9081-hifi",
        .playback = {
-               .stream_name = "HiFi Playback",
+               .stream_name = "AIF",
                .channels_min = 1,
                .channels_max = 2,
                .rates = WM9081_RATES,