diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-08 07:12:23 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-08 07:29:18 -0400 |
commit | 0fb7d0c30b59db5bea833546aae1fea8a0e94356 (patch) | |
tree | e3856d3b624832001d281c20f9c79f2a03b82265 /sound/soc/codecs/wm9081.c | |
parent | 55b27847302d2027127c3a3b75c4c1c21d6a2f6b (diff) |
ASoC: wm9081: Hook DAC up via DAPM rather than stream
More current API usage.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm9081.c')
-rw-r--r-- | sound/soc/codecs/wm9081.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 076c126ed9b1..9328270df16c 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -774,7 +774,7 @@ static const struct snd_soc_dapm_widget wm9081_dapm_widgets[] = { | |||
774 | SND_SOC_DAPM_INPUT("IN1"), | 774 | SND_SOC_DAPM_INPUT("IN1"), |
775 | SND_SOC_DAPM_INPUT("IN2"), | 775 | SND_SOC_DAPM_INPUT("IN2"), |
776 | 776 | ||
777 | SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM9081_POWER_MANAGEMENT, 0, 0), | 777 | SND_SOC_DAPM_DAC("DAC", NULL, WM9081_POWER_MANAGEMENT, 0, 0), |
778 | 778 | ||
779 | SND_SOC_DAPM_MIXER_NAMED_CTL("Mixer", SND_SOC_NOPM, 0, 0, | 779 | SND_SOC_DAPM_MIXER_NAMED_CTL("Mixer", SND_SOC_NOPM, 0, 0, |
780 | mixer, ARRAY_SIZE(mixer)), | 780 | mixer, ARRAY_SIZE(mixer)), |
@@ -799,6 +799,7 @@ SND_SOC_DAPM_SUPPLY("TSENSE", WM9081_POWER_MANAGEMENT, 7, 0, NULL, 0), | |||
799 | static const struct snd_soc_dapm_route wm9081_audio_paths[] = { | 799 | static const struct snd_soc_dapm_route wm9081_audio_paths[] = { |
800 | { "DAC", NULL, "CLK_SYS" }, | 800 | { "DAC", NULL, "CLK_SYS" }, |
801 | { "DAC", NULL, "CLK_DSP" }, | 801 | { "DAC", NULL, "CLK_DSP" }, |
802 | { "DAC", NULL, "AIF" }, | ||
802 | 803 | ||
803 | { "Mixer", "IN1 Switch", "IN1" }, | 804 | { "Mixer", "IN1 Switch", "IN1" }, |
804 | { "Mixer", "IN2 Switch", "IN2" }, | 805 | { "Mixer", "IN2 Switch", "IN2" }, |
@@ -1252,7 +1253,7 @@ static const struct snd_soc_dai_ops wm9081_dai_ops = { | |||
1252 | static struct snd_soc_dai_driver wm9081_dai = { | 1253 | static struct snd_soc_dai_driver wm9081_dai = { |
1253 | .name = "wm9081-hifi", | 1254 | .name = "wm9081-hifi", |
1254 | .playback = { | 1255 | .playback = { |
1255 | .stream_name = "HiFi Playback", | 1256 | .stream_name = "AIF", |
1256 | .channels_min = 1, | 1257 | .channels_min = 1, |
1257 | .channels_max = 2, | 1258 | .channels_max = 2, |
1258 | .rates = WM9081_RATES, | 1259 | .rates = WM9081_RATES, |