diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-06 12:23:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-10 04:57:25 -0400 |
commit | 698cb111f44d81dd3a604ba2a7f3f865b66b9ddf (patch) | |
tree | 917ec7764f3127e0caf4d30ff9c89fe006fe4888 /sound | |
parent | 9a76f1ff6e299fbb04149fe15aff061351fd0dab (diff) |
ASoC: Remove /s from widget names on SMDK64xx WM8580
Otherwise debugfs gets upset when we try to create filenames with /
in them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/s3c24xx/smdk64xx_wm8580.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index 07e8e51d10d6..5853f6609f6f 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c | |||
@@ -138,9 +138,9 @@ static struct snd_soc_ops smdk64xx_ops = { | |||
138 | 138 | ||
139 | /* SMDK64xx Playback widgets */ | 139 | /* SMDK64xx Playback widgets */ |
140 | static const struct snd_soc_dapm_widget wm8580_dapm_widgets_pbk[] = { | 140 | static const struct snd_soc_dapm_widget wm8580_dapm_widgets_pbk[] = { |
141 | SND_SOC_DAPM_HP("Front-L/R", NULL), | 141 | SND_SOC_DAPM_HP("Front", NULL), |
142 | SND_SOC_DAPM_HP("Center/Sub", NULL), | 142 | SND_SOC_DAPM_HP("Center+Sub", NULL), |
143 | SND_SOC_DAPM_HP("Rear-L/R", NULL), | 143 | SND_SOC_DAPM_HP("Rear", NULL), |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* SMDK64xx Capture widgets */ | 146 | /* SMDK64xx Capture widgets */ |
@@ -162,16 +162,16 @@ static const struct snd_soc_dapm_route audio_map_tx[] = { | |||
162 | /* SMDK-PAIFRX connections */ | 162 | /* SMDK-PAIFRX connections */ |
163 | static const struct snd_soc_dapm_route audio_map_rx[] = { | 163 | static const struct snd_soc_dapm_route audio_map_rx[] = { |
164 | /* Front Left/Right are fed VOUT1L/R */ | 164 | /* Front Left/Right are fed VOUT1L/R */ |
165 | {"Front-L/R", NULL, "VOUT1L"}, | 165 | {"Front", NULL, "VOUT1L"}, |
166 | {"Front-L/R", NULL, "VOUT1R"}, | 166 | {"Front", NULL, "VOUT1R"}, |
167 | 167 | ||
168 | /* Center/Sub are fed VOUT2L/R */ | 168 | /* Center/Sub are fed VOUT2L/R */ |
169 | {"Center/Sub", NULL, "VOUT2L"}, | 169 | {"Center+Sub", NULL, "VOUT2L"}, |
170 | {"Center/Sub", NULL, "VOUT2R"}, | 170 | {"Center+Sub", NULL, "VOUT2R"}, |
171 | 171 | ||
172 | /* Rear Left/Right are fed VOUT3L/R */ | 172 | /* Rear Left/Right are fed VOUT3L/R */ |
173 | {"Rear-L/R", NULL, "VOUT3L"}, | 173 | {"Rear", NULL, "VOUT3L"}, |
174 | {"Rear-L/R", NULL, "VOUT3R"}, | 174 | {"Rear", NULL, "VOUT3R"}, |
175 | }; | 175 | }; |
176 | 176 | ||
177 | static int smdk64xx_wm8580_init_paiftx(struct snd_soc_codec *codec) | 177 | static int smdk64xx_wm8580_init_paiftx(struct snd_soc_codec *codec) |