ASoC: Remove /s from widget names on SMDK64xx WM8580
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Aug 2010 16:23:02 +0000 (17:23 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Aug 2010 08:57:25 +0000 (09:57 +0100)
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>
sound/soc/s3c24xx/smdk64xx_wm8580.c

index 07e8e51..5853f66 100644 (file)
@@ -138,9 +138,9 @@ static struct snd_soc_ops smdk64xx_ops = {
 
 /* SMDK64xx Playback widgets */
 static const struct snd_soc_dapm_widget wm8580_dapm_widgets_pbk[] = {
-       SND_SOC_DAPM_HP("Front-L/R", NULL),
-       SND_SOC_DAPM_HP("Center/Sub", NULL),
-       SND_SOC_DAPM_HP("Rear-L/R", NULL),
+       SND_SOC_DAPM_HP("Front", NULL),
+       SND_SOC_DAPM_HP("Center+Sub", NULL),
+       SND_SOC_DAPM_HP("Rear", NULL),
 };
 
 /* SMDK64xx Capture widgets */
@@ -162,16 +162,16 @@ static const struct snd_soc_dapm_route audio_map_tx[] = {
 /* SMDK-PAIFRX connections */
 static const struct snd_soc_dapm_route audio_map_rx[] = {
        /* Front Left/Right are fed VOUT1L/R */
-       {"Front-L/R", NULL, "VOUT1L"},
-       {"Front-L/R", NULL, "VOUT1R"},
+       {"Front", NULL, "VOUT1L"},
+       {"Front", NULL, "VOUT1R"},
 
        /* Center/Sub are fed VOUT2L/R */
-       {"Center/Sub", NULL, "VOUT2L"},
-       {"Center/Sub", NULL, "VOUT2R"},
+       {"Center+Sub", NULL, "VOUT2L"},
+       {"Center+Sub", NULL, "VOUT2R"},
 
        /* Rear Left/Right are fed VOUT3L/R */
-       {"Rear-L/R", NULL, "VOUT3L"},
-       {"Rear-L/R", NULL, "VOUT3R"},
+       {"Rear", NULL, "VOUT3L"},
+       {"Rear", NULL, "VOUT3R"},
 };
 
 static int smdk64xx_wm8580_init_paiftx(struct snd_soc_codec *codec)