diff options
Diffstat (limited to 'sound/soc/tegra/trimslice.c')
-rw-r--r-- | sound/soc/tegra/trimslice.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index 043eb7c7eb73..7d95b7697a73 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c | |||
@@ -115,28 +115,6 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = { | |||
115 | {"RLINEIN", NULL, "Line In"}, | 115 | {"RLINEIN", NULL, "Line In"}, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd) | ||
119 | { | ||
120 | struct snd_soc_codec *codec = rtd->codec; | ||
121 | struct snd_soc_card *card = codec->card; | ||
122 | int ret; | ||
123 | |||
124 | ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1, | ||
125 | TEGRA_DAS_DAP_SEL_DAC1); | ||
126 | if (ret) { | ||
127 | dev_err(card->dev, "Can't set up DAS DAP connection\n"); | ||
128 | return ret; | ||
129 | } | ||
130 | ret = tegra_das_connect_dac_to_dap(TEGRA_DAS_DAC_ID_1, | ||
131 | TEGRA_DAS_DAC_SEL_DAP1); | ||
132 | if (ret) { | ||
133 | dev_err(card->dev, "Can't set up DAS DAC connection\n"); | ||
134 | return ret; | ||
135 | } | ||
136 | |||
137 | return 0; | ||
138 | } | ||
139 | |||
140 | static struct snd_soc_dai_link trimslice_tlv320aic23_dai = { | 118 | static struct snd_soc_dai_link trimslice_tlv320aic23_dai = { |
141 | .name = "TLV320AIC23", | 119 | .name = "TLV320AIC23", |
142 | .stream_name = "AIC23", | 120 | .stream_name = "AIC23", |
@@ -144,7 +122,6 @@ static struct snd_soc_dai_link trimslice_tlv320aic23_dai = { | |||
144 | .platform_name = "tegra-pcm-audio", | 122 | .platform_name = "tegra-pcm-audio", |
145 | .cpu_dai_name = "tegra-i2s.0", | 123 | .cpu_dai_name = "tegra-i2s.0", |
146 | .codec_dai_name = "tlv320aic23-hifi", | 124 | .codec_dai_name = "tlv320aic23-hifi", |
147 | .init = trimslice_asoc_init, | ||
148 | .ops = &trimslice_asoc_ops, | 125 | .ops = &trimslice_asoc_ops, |
149 | }; | 126 | }; |
150 | 127 | ||