diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:11 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:11 +0000 |
| commit | 53f3bdb0903f10e331b338b5d8ce7e464cb0ca3d (patch) | |
| tree | c478f67b5ad2436ad48713d77f07a3f622e97d70 | |
| parent | c9aa1625b747913151db5f51a543cbcc24ca03aa (diff) | |
| parent | 7b2655b409211d619d99a1bb325797dee22a1c8b (diff) | |
| download | linux-53f3bdb0903f10e331b338b5d8ce7e464cb0ca3d.tar.gz linux-53f3bdb0903f10e331b338b5d8ce7e464cb0ca3d.tar.bz2 linux-53f3bdb0903f10e331b338b5d8ce7e464cb0ca3d.zip | |
Merge remote-tracking branch 'asoc/topic/cirrus' into asoc-next
| -rw-r--r-- | sound/soc/cirrus/snappercl15.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index 29238a7476dd..5b68b106cfc2 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -65,18 +65,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"MICIN", NULL, "Mic Jack"}, }; -static int snappercl15_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets, - ARRAY_SIZE(tlv320aic23_dapm_widgets)); - - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); - return 0; -} - static struct snd_soc_dai_link snappercl15_dai = { .name = "tlv320aic23", .stream_name = "AIC23", @@ -84,7 +72,6 @@ static struct snd_soc_dai_link snappercl15_dai = { .codec_dai_name = "tlv320aic23-hifi", .codec_name = "tlv320aic23-codec.0-001a", .platform_name = "ep93xx-i2s", - .init = snappercl15_tlv320aic23_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS, .ops = &snappercl15_ops, @@ -95,6 +82,11 @@ static struct snd_soc_card snd_soc_snappercl15 = { .owner = THIS_MODULE, .dai_link = &snappercl15_dai, .num_links = 1, + + .dapm_widgets = tlv320aic23_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets), + .dapm_routes = audio_map, + .num_dapm_routes = ARRAY_SIZE(audio_map), }; static int snappercl15_probe(struct platform_device *pdev) |