ASoC: corgi: Automatically disconnect non-connected pins
Subsystems (3)
PATCH 1/8 ASoC: corgi: Automatically disconnect non-connected pins
All DAPM input and output pins of the wm8994 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.
--- sound/soc/pxa/corgi.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
sound/soc/pxa/corgi.c +1 -15
@@ -259,20 +259,6 @@ static const struct snd_kcontrol_new wm8731_corgi_controls[] = { corgi_set_spk), }; -/* -* Logic for a wm8731 as connected on a Sharp SL-C7x0 Device -*/ -static int corgi_wm8731_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,"LLINEIN" ); -snd_soc_dapm_nc_pin (dapm,"RLINEIN" ); - -return 0 ; -} -/* corgi digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link corgi_dai = { .name ="WM8731" ,
@@ -281,7 +267,6 @@ static struct snd_soc_dai_link corgi_dai = { .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm8731.0-001b", - .init = corgi_wm8731_init, .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ops = &corgi_ops,
@@ -300,6 +285,7 @@ static struct snd_soc_card corgi = { .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), .dapm_routes = corgi_audio_map, .num_dapm_routes = ARRAY_SIZE(corgi_audio_map), + .fully_routed = true, };static int corgi_probe (struct platform_device *pdev)
Signature · 1 line
1.8.0
PATCH 2/8 ASoC: e740: 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.
--- sound/soc/pxa/e740_wm9705.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
sound/soc/pxa/e740_wm9705.c +1 -19
@@ -88,24 +88,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Mic Amp", NULL, "Mic (Internal)"}, }; -static int e740_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, "HPOUTL"); - snd_soc_dapm_nc_pin(dapm, "HPOUTR"); - 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 e740_dai[] = { { .name = "AC97",
@@ -114,7 +96,6 @@ static struct snd_soc_dai_link e740_dai[] = { .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", - .init = e740_ac97_init, }, { .name = "AC97 Aux",
@@ -136,6 +117,7 @@ static struct snd_soc_card e740 = { .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets), .dapm_routes = audio_map, .num_dapm_routes = ARRAY_SIZE(audio_map), + .fully_routed = true, };static struct gpio e740_audio_gpios[] = {
Signature · 1 line
1.8.0
PATCH 3/8 ASoC: e750: Automatically disconnect non-connected pins
In reply to Lars-Peter ClausenAll 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.
--- sound/soc/pxa/e750_wm9705.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
sound/soc/pxa/e750_wm9705.c +1 -19
@@ -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[] = {
Signature · 1 line
1.8.0
PATCH 4/8 ASoC: hx4700: Automatically disconnect non-connected pins
In reply to Lars-Peter ClausenAll DAPM input and output pins of the ak4641 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.
--- sound/soc/pxa/hx4700.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
sound/soc/pxa/hx4700.c +1 -7
@@ -127,15 +127,8 @@ static const struct snd_soc_dapm_route hx4700_audio_map[] = {static int hx4700_ak4641_init (struct snd_soc_pcm_runtime *rtd) {struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm;int err; -/* NC codec pins */ -/* FIXME: is anything connected here? */ -snd_soc_dapm_nc_pin (dapm,"MOUT1" ); -snd_soc_dapm_nc_pin (dapm,"MICEXT" ); -snd_soc_dapm_nc_pin (dapm,"AUX" ); -/* Jack detection API stuff */ err =snd_soc_jack_new (codec,"Headphone Jack" ,SND_JACK_HEADPHONE , &hs_jack);
@@ -184,6 +177,7 @@ static struct snd_soc_card snd_soc_card_hx4700 = { .num_dapm_widgets = ARRAY_SIZE(hx4700_dapm_widgets), .dapm_routes = hx4700_audio_map, .num_dapm_routes = ARRAY_SIZE(hx4700_audio_map), + .fully_routed = true, };static struct gpio hx4700_audio_gpios[] = {
Signature · 1 line
1.8.0
PATCH 5/8 ASoC: magician: Automatically disconnect non-connected pins
In reply to Lars-Peter ClausenAll DAPM input and output pins of the uda1380 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.
--- sound/soc/pxa/magician.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
sound/soc/pxa/magician.c +1 -20
@@ -391,25 +391,6 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = { magician_get_input, magician_set_input), }; -/* -* Logic for a uda1380 as connected on a HTC Magician -*/ -static int magician_uda1380_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; - -/* NC codec pins */ -snd_soc_dapm_nc_pin (dapm,"VOUTLHP" ); -snd_soc_dapm_nc_pin (dapm,"VOUTRHP" ); - -/* FIXME: is anything connected here? */ -snd_soc_dapm_nc_pin (dapm,"VINL" ); -snd_soc_dapm_nc_pin (dapm,"VINR" ); - -return 0 ; -} -/* magician digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link magician_dai[] = { {
@@ -419,7 +400,6 @@ static struct snd_soc_dai_link magician_dai[] = { .codec_dai_name = "uda1380-hifi-playback", .platform_name = "pxa-pcm-audio", .codec_name = "uda1380-codec.0-0018", - .init = magician_uda1380_init, .ops = &magician_playback_ops, }, {
@@ -446,6 +426,7 @@ static struct snd_soc_card snd_soc_card_magician = { .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets), .dapm_routes = audio_map, .num_dapm_routes = ARRAY_SIZE(audio_map), + .fully_routed = true, };static struct platform_device *magician_snd_device;
Signature · 1 line
1.8.0
PATCH 6/8 ASoC: palm27x: Fix microphone route
In reply to Lars-Peter ClausenThe microphone route has sink and source swapped.
--- sound/soc/pxa/palm27x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/pxa/palm27x.c +1 -1
@@ -68,7 +68,7 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Ext. Speaker", NULL, "ROUT2"},/* mic connected to MIC1 */ - {"Ext. Microphone", NULL, "MIC1"}, + {"MIC1", NULL, "Ext. Microphone"}, };static struct snd_soc_card palm27x_asoc;
Signature · 1 line
1.8.0
PATCH 7/8 ASoC: palm27x: Automatically disconnect non-connected pins
In reply to Lars-Peter ClausenAll DAPM input and output pins of the wm9712 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.
--- sound/soc/pxa/palm27x.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
sound/soc/pxa/palm27x.c +2 -11
@@ -76,18 +76,8 @@ static struct snd_soc_card palm27x_asoc;static int palm27x_ac97_init (struct snd_soc_pcm_runtime *rtd) {struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm;int err; -/* not connected pins */ -snd_soc_dapm_nc_pin (dapm,"OUT3" ); -snd_soc_dapm_nc_pin (dapm,"MONOOUT" ); -snd_soc_dapm_nc_pin (dapm,"LINEINL" ); -snd_soc_dapm_nc_pin (dapm,"LINEINR" ); -snd_soc_dapm_nc_pin (dapm,"PCBEEP" ); -snd_soc_dapm_nc_pin (dapm,"PHONE" ); -snd_soc_dapm_nc_pin (dapm,"MIC2" ); -/* Jack detection API stuff */ err =snd_soc_jack_new (codec,"Headphone Jack" ,SND_JACK_HEADPHONE , &hs_jack);
@@ -133,7 +123,8 @@ static struct snd_soc_card palm27x_asoc = { .dapm_widgets = palm27x_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(palm27x_dapm_widgets), .dapm_routes = audio_map, - .num_dapm_routes = ARRAY_SIZE(audio_map) + .num_dapm_routes = ARRAY_SIZE(audio_map), + .fully_routed = true, };static int palm27x_asoc_probe (struct platform_device *pdev)
Signature · 1 line
1.8.0
PATCH 8/8 ASoC: spitz: Automatically disconnect non-connected pins
In reply to Lars-Peter ClausenAll DAPM input and output pins of the wm8750 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.
--- sound/soc/pxa/spitz.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)
sound/soc/pxa/spitz.c +1 -21
@@ -256,26 +256,6 @@ static const struct snd_kcontrol_new wm8750_spitz_controls[] = { spitz_set_spk), }; -/* -* Logic for a wm8750 as connected on a Sharp SL-Cxx00 Device -*/ -static int spitz_wm8750_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; - -/* NC codec pins */ -snd_soc_dapm_nc_pin (dapm,"RINPUT1" ); -snd_soc_dapm_nc_pin (dapm,"LINPUT2" ); -snd_soc_dapm_nc_pin (dapm,"RINPUT2" ); -snd_soc_dapm_nc_pin (dapm,"LINPUT3" ); -snd_soc_dapm_nc_pin (dapm,"RINPUT3" ); -snd_soc_dapm_nc_pin (dapm,"OUT3" ); -snd_soc_dapm_nc_pin (dapm,"MONO1" ); - -return 0 ; -} -/* spitz digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link spitz_dai = { .name ="wm8750" ,
@@ -284,7 +264,6 @@ static struct snd_soc_dai_link spitz_dai = { .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm8750.0-001b", - .init = spitz_wm8750_init, .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ops = &spitz_ops,
@@ -303,6 +282,7 @@ static struct snd_soc_card snd_soc_spitz = { .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets), .dapm_routes = spitz_audio_map, .num_dapm_routes = ARRAY_SIZE(spitz_audio_map), + .fully_routed = true, };static int spitz_probe (struct platform_device *pdev)
Signature · 1 line
1.8.0
Quoted 2 lines · Lars-Peter Clausen
All DAPM input and output pins of the wm8994 are either used in the card's DAPM routing table or are marked as not connected.
Applied all, thanks.