ASoC: e750: Automatically disconnect non-connected pins
All DAPM input and output pins of the wm9705 are either used in the card's DAPM routing table or are marked as not connected. Set the fully_routed flag of the card instead of manually marking the unused inputs and outputs as not connected. This makes the code a bit shorter and cleaner. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
dff6c96423
Коммит
7523f69e58
|
@ -70,24 +70,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
|||
{"MIC1", NULL, "Mic (Internal)"},
|
||||
};
|
||||
|
||||
static int e750_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, "LOUT");
|
||||
snd_soc_dapm_nc_pin(dapm, "ROUT");
|
||||
snd_soc_dapm_nc_pin(dapm, "PHONE");
|
||||
snd_soc_dapm_nc_pin(dapm, "LINEINL");
|
||||
snd_soc_dapm_nc_pin(dapm, "LINEINR");
|
||||
snd_soc_dapm_nc_pin(dapm, "CDINL");
|
||||
snd_soc_dapm_nc_pin(dapm, "CDINR");
|
||||
snd_soc_dapm_nc_pin(dapm, "PCBEEP");
|
||||
snd_soc_dapm_nc_pin(dapm, "MIC2");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_soc_dai_link e750_dai[] = {
|
||||
{
|
||||
.name = "AC97",
|
||||
|
@ -96,7 +78,6 @@ static struct snd_soc_dai_link e750_dai[] = {
|
|||
.codec_dai_name = "wm9705-hifi",
|
||||
.platform_name = "pxa-pcm-audio",
|
||||
.codec_name = "wm9705-codec",
|
||||
.init = e750_ac97_init,
|
||||
/* use ops to check startup state */
|
||||
},
|
||||
{
|
||||
|
@ -119,6 +100,7 @@ static struct snd_soc_card e750 = {
|
|||
.num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets),
|
||||
.dapm_routes = audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
||||
.fully_routed = true,
|
||||
};
|
||||
|
||||
static struct gpio e750_audio_gpios[] = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче