ASoC: Intel: avs: remove redundant dapm routes
Subsystems (3)
cover ASoC: Intel: avs: remove redundant dapm routes
This patch series remove redundant dapm routes declared in multiple machine drivers. These routes will be created by snd_soc_dapm_connect_dai_link_widgets() during soundcard initialization. Following is the kernel log from a KBL chromebook nocturne.
dmic:
[ 13.773455] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC Rx [ 13.773460] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC WoV Rx
max98373:
[ 14.079536] avs_max98373 avs_max98373.1: connected DAI link avs_max98373.1-platform:ssp0 Tx -> i2c-MX98373:00:Right HiFi Playback [ 14.079545] avs_max98373 avs_max98373.1: connected DAI link i2c-MX98373:00:Right HiFi Capture -> avs_max98373.1-platform:ssp0 Rx [ 14.079550] avs_max98373 avs_max98373.1: connected DAI link avs_max98373.1-platform:ssp0 Tx -> i2c-MX98373:01:Left HiFi Playback [ 14.079554] avs_max98373 avs_max98373.1: connected DAI link i2c-MX98373:01:Left HiFi Capture -> avs_max98373.1-platform:ssp0 Rx
hdaudio:
[ 14.094818] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu0 Tx -> hdaudioB0D2:HDMI 0 Playback [ 14.094824] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu1 Tx -> hdaudioB0D2:HDMI 1 Playback [ 14.094828] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu2 Tx -> hdaudioB0D2:HDMI 2 Playback
Brent Lu (12):
ASoC: Intel: avs-da7219: remove redundant dapm routes
ASoC: Intel: avs-dmic: remove redundant dapm routes
ASoC: Intel: avs-hdaudio: remove redundant dapm routes
ASoC: Intel: avs-max98357a: remove redundant dapm routes
ASoC: Intel: avs-max98373: remove redundant dapm routes
ASoC: Intel: avs-max98927: remove redundant dapm routes
ASoC: Intel: avs-nau8825: remove redundant dapm routes
ASoC: Intel: avs-rt274: remove redundant dapm routes
ASoC: Intel: avs-rt286: remove redundant dapm routes
ASoC: Intel: avs-rt298: remove redundant dapm routes
ASoC: Intel: avs-rt5682: remove redundant dapm routes
ASoC: Intel: avs-ssm4567: remove redundant dapm routes
sound/soc/intel/avs/boards/da7219.c | 45 ++---------------- sound/soc/intel/avs/boards/dmic.c | 2 - sound/soc/intel/avs/boards/hdaudio.c | 65 +------------------------- sound/soc/intel/avs/boards/max98357a.c | 39 ++-------------- sound/soc/intel/avs/boards/max98373.c | 45 ++---------------- sound/soc/intel/avs/boards/max98927.c | 45 ++---------------- sound/soc/intel/avs/boards/nau8825.c | 45 ++---------------- sound/soc/intel/avs/boards/rt274.c | 45 ++---------------- sound/soc/intel/avs/boards/rt286.c | 45 ++---------------- sound/soc/intel/avs/boards/rt298.c | 45 ++---------------- sound/soc/intel/avs/boards/rt5682.c | 45 ++---------------- sound/soc/intel/avs/boards/ssm4567.c | 57 ++-------------------- 12 files changed, 31 insertions(+), 492 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/12 ASoC: Intel: avs-da7219: remove redundant dapm routes
Two routes "Playback<-sspX Tx" and "sspX Rx<-Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/da7219.c | 45 ++--------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/da7219.c +3 -42
@@ -181,38 +181,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,DA7219_DAI_NAME );
@@ -230,14 +198,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_da7219_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -249,12 +216,6 @@ static int avs_da7219_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -271,8 +232,8 @@ static int avs_da7219_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 2/12 ASoC: Intel: avs-dmic: remove redundant dapm routes
In reply to Brent LuTwo routes "DMIC Rx<-Capture" and "DMIC WoV Rx<-Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/dmic.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/intel/avs/boards/dmic.c +0 -2
@@ -44,8 +44,6 @@ static const struct snd_soc_dapm_widget card_widgets[] = {static const struct snd_soc_dapm_route card_routes[] = { {"DMic" ,NULL ,"SoC DMIC" }, - {"DMIC Rx" ,NULL ,"Capture" }, - {"DMIC WoV Rx" ,NULL ,"Capture" }, };static int avs_dmic_probe (struct platform_device *pdev)
Signature · 1 line
2.34.1
PATCH 3/12 ASoC: Intel: avs-hdaudio: remove redundant dapm routes
In reply to Brent LuThree routes "HDMI 0 Playback<-hdaudioB0D2-cpu0 Tx", "HDMI 1 Playback<-hdaudioB0D2-cpu1 Tx" and
"HDMI 2 Playback<-hdaudioB0D2-cpu2 Tx" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/hdaudio.c | 65 +--------------------------- 1 file changed, 1 insertion(+), 64 deletions(-)
sound/soc/intel/avs/boards/hdaudio.c +1 -64
@@ -64,56 +64,6 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, intreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,struct hda_codec *codec,int pcm_count, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -struct hda_pcm *pcm; -const char *cname =dev_name (&codec->core.dev); -int i, n =0 ; - -/* at max twice the number of pcms */ - dr =devm_kcalloc (dev, pcm_count *2 ,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - - pcm = list_first_entry(&codec->pcm_list_head, struct hda_pcm, list); - -for (i =0 ; i < pcm_count; i++, pcm =list_next_entry (pcm, list)) { -struct hda_pcm_stream *stream; -int dir; - - dir =SNDRV_PCM_STREAM_PLAYBACK ; - stream = &pcm->stream[dir]; -if (!stream->substreams) - goto capture_routes; - - dr[n].sink =devm_kasprintf (dev,GFP_KERNEL ,"%s %s" , pcm->name, -snd_pcm_direction_name (dir)); - dr[n].source =devm_kasprintf (dev,GFP_KERNEL ,"%s-cpu%d Tx" , cname, i); -if (!dr[n].sink || !dr[n].source) -return -ENOMEM ; - n++; - -capture_routes: - dir =SNDRV_PCM_STREAM_CAPTURE ; - stream = &pcm->stream[dir]; -if (!stream->substreams) -continue ; - - dr[n].sink =devm_kasprintf (dev,GFP_KERNEL ,"%s-cpu%d Rx" , cname, i); - dr[n].source =devm_kasprintf (dev,GFP_KERNEL ,"%s %s" , pcm->name, -snd_pcm_direction_name (dir)); -if (!dr[n].sink || !dr[n].source) -return -ENOMEM ; - n++; - } - - *routes = dr; - *num_routes = n; -return 0 ; -} -/* Should be aligned with SectionPCM's name from topology */ #define FEDAI_NAME_PREFIX "HDMI"
@@ -172,13 +122,12 @@ static int avs_card_late_probe(struct snd_soc_card *card)static int avs_probing_link_init (struct snd_soc_pcm_runtime *rtm) { -struct snd_soc_dapm_route *routes;struct snd_soc_acpi_mach *mach;struct snd_soc_dai_link *links =NULL ;struct snd_soc_card *card = rtm->card;struct hda_codec *codec;struct hda_pcm *pcm; -int ret, n, pcm_count =0 ; +int ret, pcm_count =0 ; mach =dev_get_platdata (card->dev); codec = mach->pdata;
@@ -200,18 +149,6 @@ static int avs_probing_link_init(struct snd_soc_pcm_runtime *rtm)return ret; } - ret =avs_create_dapm_routes (card->dev, codec, pcm_count, &routes, &n); -if (ret <0 ) { -dev_err (card->dev,"create routes failed: %d\n" , ret); -return ret; - } - - ret =snd_soc_dapm_add_routes (&card->dapm, routes, n); -if (ret <0 ) { -dev_err (card->dev,"add routes failed: %d\n" , ret); -return ret; - } -return 0 ; }
Signature · 1 line
2.34.1
PATCH 4/12 ASoC: Intel: avs-max98357a: remove redundant dapm routes
In reply to Brent LuThe route "HiFi Playback<-sspX Tx" is created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/max98357a.c | 39 ++------------------------ 1 file changed, 3 insertions(+), 36 deletions(-)
sound/soc/intel/avs/boards/max98357a.c +3 -36
@@ -86,41 +86,14 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +1 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"HiFi Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_max98357a_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -132,12 +105,6 @@ static int avs_max98357a_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!card)return -ENOMEM ;
@@ -151,8 +118,8 @@ static int avs_max98357a_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true; ret =snd_soc_fixup_dai_links_platform_name (card, pname);
Signature · 1 line
2.34.1
PATCH 5/12 ASoC: Intel: avs-max98373: remove redundant dapm routes
In reply to Brent LuTwo routes "Left HiFi Playback<-sspX Tx" and
"Right HiFi Playback<-sspX Tx" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/max98373.c | 45 ++------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/max98373.c +3 -42
@@ -141,47 +141,14 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Left HiFi Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Right HiFi Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_max98373_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -193,12 +160,6 @@ static int avs_max98373_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!card)return -ENOMEM ;
@@ -214,8 +175,8 @@ static int avs_max98373_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true; ret =snd_soc_fixup_dai_links_platform_name (card, pname);
Signature · 1 line
2.34.1
PATCH 6/12 ASoC: Intel: avs-max98927: remove redundant dapm routes
In reply to Brent LuTwo routes "Left HiFi Playback<-sspX Tx" and
"Right HiFi Playback<-sspX Tx" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/max98927.c | 45 ++------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/max98927.c +3 -42
@@ -138,47 +138,14 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Left HiFi Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Right HiFi Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_max98927_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -190,12 +157,6 @@ static int avs_max98927_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!card)return -ENOMEM ;
@@ -211,8 +172,8 @@ static int avs_max98927_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true; ret =snd_soc_fixup_dai_links_platform_name (card, pname);
Signature · 1 line
2.34.1
PATCH 7/12 ASoC: Intel: avs-nau8825: remove redundant dapm routes
In reply to Brent LuTwo routes "Playback<-sspX Tx" and "sspX Rx<-Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/nau8825.c | 45 ++-------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/nau8825.c +3 -42
@@ -215,38 +215,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,SKL_NUVOTON_CODEC_DAI );
@@ -274,14 +242,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_nau8825_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -293,12 +260,6 @@ static int avs_nau8825_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -315,8 +276,8 @@ static int avs_nau8825_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 8/12 ASoC: Intel: avs-rt274: remove redundant dapm routes
In reply to Brent LuTwo routes "AIF1 Playback<-sspX Tx" and "sspX Rx<-AIF1 Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/rt274.c | 45 ++---------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/rt274.c +3 -42
@@ -188,38 +188,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,RT274_CODEC_DAI );
@@ -237,14 +205,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_rt274_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -256,12 +223,6 @@ static int avs_rt274_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -278,8 +239,8 @@ static int avs_rt274_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 9/12 ASoC: Intel: avs-rt286: remove redundant dapm routes
In reply to Brent LuTwo routes "AIF1 Playback<-sspX Tx" and "sspX Rx<-AIF1 Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/rt286.c | 45 ++---------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/rt286.c +3 -42
@@ -158,38 +158,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,RT286_CODEC_DAI );
@@ -207,14 +175,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_rt286_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -226,12 +193,6 @@ static int avs_rt286_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -248,8 +209,8 @@ static int avs_rt286_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 10/12 ASoC: Intel: avs-rt298: remove redundant dapm routes
In reply to Brent LuTwo routes "AIF1 Playback<-sspX Tx" and "sspX Rx<-AIF1 Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/rt298.c | 45 ++---------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/rt298.c +3 -42
@@ -178,38 +178,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,RT298_CODEC_DAI );
@@ -227,14 +195,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_rt298_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -246,12 +213,6 @@ static int avs_rt298_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -268,8 +229,8 @@ static int avs_rt298_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 11/12 ASoC: Intel: avs-rt5682: remove redundant dapm routes
In reply to Brent LuTwo routes "AIF1 Playback<-sspX Tx" and "sspX Rx<-AIF1 Capture" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/rt5682.c | 45 ++--------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
sound/soc/intel/avs/boards/rt5682.c +3 -42
@@ -234,38 +234,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +2 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"AIF1 Capture" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_card_suspend_pre (struct snd_soc_card *card) {struct snd_soc_dai *codec_dai =snd_soc_card_get_codec_dai (card,AVS_RT5682_CODEC_DAI_NAME );
@@ -283,14 +251,13 @@ static int avs_card_resume_post(struct snd_soc_card *card)static int avs_rt5682_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct snd_soc_jack *jack;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret;if (pdev->id_entry && pdev->id_entry->driver_data) avs_rt5682_quirk = (unsigned long )pdev->id_entry->driver_data;
@@ -308,12 +275,6 @@ static int avs_rt5682_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - jack =devm_kzalloc (dev,sizeof (*jack),GFP_KERNEL ); card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!jack || !card)
@@ -330,8 +291,8 @@ static int avs_rt5682_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true;snd_soc_card_set_drvdata (card, jack);
Signature · 1 line
2.34.1
PATCH 12/12 ASoC: Intel: avs-ssm4567: remove redundant dapm routes
In reply to Brent LuFour routes "Left Playback<-sspX Tx", "Right Playback<-sspX Tx", "sspX Rx<-Left Capture Sense", and "sspX Rx<-Right Capture Sense" are created by snd_soc_dapm_connect_dai_link_widgets() automatically. Remove the duplicate routes.
--- sound/soc/intel/avs/boards/ssm4567.c | 57 ++-------------------------- 1 file changed, 3 insertions(+), 54 deletions(-)
sound/soc/intel/avs/boards/ssm4567.c +3 -54
@@ -129,59 +129,14 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, inreturn 0 ; } -static int avs_create_dapm_routes (struct device *dev,int ssp_port, -struct snd_soc_dapm_route **routes,int *num_routes) -{ -struct snd_soc_dapm_route *dr; -const int num_base =ARRAY_SIZE (card_base_routes); -const int num_dr = num_base +4 ; -int idx; - - dr =devm_kcalloc (dev, num_dr,sizeof (*dr),GFP_KERNEL ); -if (!dr) -return -ENOMEM ; - -memcpy (dr, card_base_routes, num_base *sizeof (*dr)); - - idx = num_base; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Left Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"Right Playback" ); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Tx" , ssp_port); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"Left Capture Sense" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - idx++; - dr[idx].sink =devm_kasprintf (dev,GFP_KERNEL ,"ssp%d Rx" , ssp_port); - dr[idx].source =devm_kasprintf (dev,GFP_KERNEL ,"Right Capture Sense" ); -if (!dr[idx].sink || !dr[idx].source) -return -ENOMEM ; - - *routes = dr; - *num_routes = num_dr; - -return 0 ; -} -static int avs_ssm4567_probe (struct platform_device *pdev) { -struct snd_soc_dapm_route *routes;struct snd_soc_dai_link *dai_link;struct snd_soc_acpi_mach *mach;struct snd_soc_card *card;struct device *dev = &pdev->dev;const char *pname; -int num_routes, ssp_port, ret; +int ssp_port, ret; mach =dev_get_platdata (dev); pname = mach->mach_params.platform;
@@ -193,12 +148,6 @@ static int avs_ssm4567_probe(struct platform_device *pdev)return ret; } - ret =avs_create_dapm_routes (dev, ssp_port, &routes, &num_routes); -if (ret) { -dev_err (dev,"Failed to create dapm routes: %d" , ret); -return ret; - } - card =devm_kzalloc (dev,sizeof (*card),GFP_KERNEL );if (!card)return -ENOMEM ;
@@ -214,8 +163,8 @@ static int avs_ssm4567_probe(struct platform_device *pdev) card->num_controls =ARRAY_SIZE (card_controls); card->dapm_widgets = card_widgets; card->num_dapm_widgets =ARRAY_SIZE (card_widgets); - card->dapm_routes = routes; - card->num_dapm_routes = num_routes; + card->dapm_routes = card_base_routes; + card->num_dapm_routes =ARRAY_SIZE (card_base_routes); card->fully_routed = true; card->disable_route_checks = true;
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 10 lines · Brent Lu
This patch series remove redundant dapm routes declared in multiple machine drivers. These routes will be created by
snd_soc_dapm_connect_dai_link_widgets()during soundcard initialization. Following is the kernel log from a KBL chromebook nocturne.dmic:
[ 13.773455] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC Rx [ 13.773460] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC WoV Rx[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/12] ASoC: Intel: avs-da7219: remove redundant dapm routes
commit: 530ca0a7ed04230408775b495034941346ea5db1
[02/12] ASoC: Intel: avs-dmic: remove redundant dapm routes
commit: c2076f4fa4f15559ed7e568186c4089479a62154
[03/12] ASoC: Intel: avs-hdaudio: remove redundant dapm routes
commit: 12ea56d73c548929ef1a498848905b04bfe85f90
[04/12] ASoC: Intel: avs-max98357a: remove redundant dapm routes
commit: d48e3cd5aaecd7769b073f65bb95004a54bc76e6
[05/12] ASoC: Intel: avs-max98373: remove redundant dapm routes
commit: b4df7ce9905b1e8cb84ee247ca7db6ae004bc508
[06/12] ASoC: Intel: avs-max98927: remove redundant dapm routes
commit: 9868ca64fd7a87cf997040452519b07e47a8d008
[07/12] ASoC: Intel: avs-nau8825: remove redundant dapm routes
commit: ae7d66822de5aeaf991eda96c823ee9dffebfe46
[08/12] ASoC: Intel: avs-rt274: remove redundant dapm routes
commit: 6227269fb375af2ff239a68499856abfd6a2bceb
[09/12] ASoC: Intel: avs-rt286: remove redundant dapm routes
commit: cca1ac1f097afa7ad6e587d6f1e86fd738ede508
[10/12] ASoC: Intel: avs-rt298: remove redundant dapm routes
commit: eae0655316a5d741ab27c7b3a67a55b0af970e19
[11/12] ASoC: Intel: avs-rt5682: remove redundant dapm routes
commit: 96b5452fe43c23451050b3efa5197bd10dce9bc6
[12/12] ASoC: Intel: avs-ssm4567: remove redundant dapm routes
commit: 51bdf6ebe5b7da8d1b86cf66fe7e21de353e5218All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark