|
@@ -185,17 +185,6 @@ static const struct snd_kcontrol_new tosa_controls[] = {
|
|
tosa_set_spk),
|
|
tosa_set_spk),
|
|
};
|
|
};
|
|
|
|
|
|
-static int tosa_ac97_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_nc_pin(dapm, "OUT3");
|
|
|
|
- snd_soc_dapm_nc_pin(dapm, "MONOOUT");
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static struct snd_soc_dai_link tosa_dai[] = {
|
|
static struct snd_soc_dai_link tosa_dai[] = {
|
|
{
|
|
{
|
|
.name = "AC97",
|
|
.name = "AC97",
|
|
@@ -204,7 +193,6 @@ static struct snd_soc_dai_link tosa_dai[] = {
|
|
.codec_dai_name = "wm9712-hifi",
|
|
.codec_dai_name = "wm9712-hifi",
|
|
.platform_name = "pxa-pcm-audio",
|
|
.platform_name = "pxa-pcm-audio",
|
|
.codec_name = "wm9712-codec",
|
|
.codec_name = "wm9712-codec",
|
|
- .init = tosa_ac97_init,
|
|
|
|
.ops = &tosa_ops,
|
|
.ops = &tosa_ops,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -230,6 +218,7 @@ static struct snd_soc_card tosa = {
|
|
.num_dapm_widgets = ARRAY_SIZE(tosa_dapm_widgets),
|
|
.num_dapm_widgets = ARRAY_SIZE(tosa_dapm_widgets),
|
|
.dapm_routes = audio_map,
|
|
.dapm_routes = audio_map,
|
|
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
|
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
|
|
|
+ .fully_routed = true,
|
|
};
|
|
};
|
|
|
|
|
|
static int tosa_probe(struct platform_device *pdev)
|
|
static int tosa_probe(struct platform_device *pdev)
|