diff options
Diffstat (limited to 'sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c')
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c index a7ef7db5468..7bdda767400 100644 --- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | |||
@@ -54,18 +54,12 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) | |||
54 | struct snd_soc_codec *codec = rtd->codec; | 54 | struct snd_soc_codec *codec = rtd->codec; |
55 | struct snd_soc_dapm_context *dapm = &codec->dapm; | 55 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
56 | 56 | ||
57 | snd_soc_dapm_new_controls(dapm, dapm_widgets, | ||
58 | ARRAY_SIZE(dapm_widgets)); | ||
59 | |||
60 | snd_soc_dapm_add_routes(dapm, base_map, ARRAY_SIZE(base_map)); | ||
61 | |||
62 | snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); | 57 | snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); |
63 | snd_soc_dapm_enable_pin(dapm, "Line In"); | 58 | snd_soc_dapm_enable_pin(dapm, "Line In"); |
64 | snd_soc_dapm_enable_pin(dapm, "Line Out"); | 59 | snd_soc_dapm_enable_pin(dapm, "Line Out"); |
65 | snd_soc_dapm_enable_pin(dapm, "Mic Jack"); | 60 | snd_soc_dapm_enable_pin(dapm, "Mic Jack"); |
66 | 61 | ||
67 | simtec_audio_init(rtd); | 62 | simtec_audio_init(rtd); |
68 | snd_soc_dapm_sync(dapm); | ||
69 | 63 | ||
70 | return 0; | 64 | return 0; |
71 | } | 65 | } |
@@ -85,6 +79,11 @@ static struct snd_soc_card snd_soc_machine_simtec_aic23 = { | |||
85 | .name = "Simtec", | 79 | .name = "Simtec", |
86 | .dai_link = &simtec_dai_aic23, | 80 | .dai_link = &simtec_dai_aic23, |
87 | .num_links = 1, | 81 | .num_links = 1, |
82 | |||
83 | .dapm_widgets = dapm_widgets, | ||
84 | .num_dapm_widgets = ARRAY_SIZE(dapm_widgets), | ||
85 | .dapm_routes = base_map, | ||
86 | .num_dapm_routes = ARRAY_SIZE(base_map), | ||
88 | }; | 87 | }; |
89 | 88 | ||
90 | static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd) | 89 | static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd) |