diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2009-05-22 08:12:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-22 10:08:43 -0400 |
commit | b4852b793a1dd74ccde5572d8a8f73e948a5b1a1 (patch) | |
tree | 0209b8905e22b955bd61752b1111af382cb8a65e /sound | |
parent | 7385ba44f8bcea15bf0d75ae2814f0cec63140b9 (diff) |
ASoC: TWL4030: Differentiate the playback streams
Give unique stream names for the two playback streams so
DAPM can figure out which codec_dai is in use.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 584507f71efb..9197fdd0a29d 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -1092,13 +1092,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
1092 | SND_SOC_DAPM_OUTPUT("VIBRA"), | 1092 | SND_SOC_DAPM_OUTPUT("VIBRA"), |
1093 | 1093 | ||
1094 | /* DACs */ | 1094 | /* DACs */ |
1095 | SND_SOC_DAPM_DAC("DAC Right1", "Right Front Playback", | 1095 | SND_SOC_DAPM_DAC("DAC Right1", "Right Front HiFi Playback", |
1096 | SND_SOC_NOPM, 0, 0), | 1096 | SND_SOC_NOPM, 0, 0), |
1097 | SND_SOC_DAPM_DAC("DAC Left1", "Left Front Playback", | 1097 | SND_SOC_DAPM_DAC("DAC Left1", "Left Front HiFi Playback", |
1098 | SND_SOC_NOPM, 0, 0), | 1098 | SND_SOC_NOPM, 0, 0), |
1099 | SND_SOC_DAPM_DAC("DAC Right2", "Right Rear Playback", | 1099 | SND_SOC_DAPM_DAC("DAC Right2", "Right Rear HiFi Playback", |
1100 | SND_SOC_NOPM, 0, 0), | 1100 | SND_SOC_NOPM, 0, 0), |
1101 | SND_SOC_DAPM_DAC("DAC Left2", "Left Rear Playback", | 1101 | SND_SOC_DAPM_DAC("DAC Left2", "Left Rear HiFi Playback", |
1102 | SND_SOC_NOPM, 0, 0), | 1102 | SND_SOC_NOPM, 0, 0), |
1103 | SND_SOC_DAPM_DAC("DAC Voice", "Voice Playback", | 1103 | SND_SOC_DAPM_DAC("DAC Voice", "Voice Playback", |
1104 | SND_SOC_NOPM, 0, 0), | 1104 | SND_SOC_NOPM, 0, 0), |
@@ -1937,7 +1937,7 @@ struct snd_soc_dai twl4030_dai[] = { | |||
1937 | { | 1937 | { |
1938 | .name = "twl4030", | 1938 | .name = "twl4030", |
1939 | .playback = { | 1939 | .playback = { |
1940 | .stream_name = "Playback", | 1940 | .stream_name = "HiFi Playback", |
1941 | .channels_min = 2, | 1941 | .channels_min = 2, |
1942 | .channels_max = 4, | 1942 | .channels_max = 4, |
1943 | .rates = TWL4030_RATES | SNDRV_PCM_RATE_96000, | 1943 | .rates = TWL4030_RATES | SNDRV_PCM_RATE_96000, |
@@ -1953,7 +1953,7 @@ struct snd_soc_dai twl4030_dai[] = { | |||
1953 | { | 1953 | { |
1954 | .name = "twl4030 Voice", | 1954 | .name = "twl4030 Voice", |
1955 | .playback = { | 1955 | .playback = { |
1956 | .stream_name = "Playback", | 1956 | .stream_name = "Voice Playback", |
1957 | .channels_min = 1, | 1957 | .channels_min = 1, |
1958 | .channels_max = 1, | 1958 | .channels_max = 1, |
1959 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, | 1959 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, |