Commit 0cb3b7fd authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: Disable route checks for Skylake boards 

Topology files that are propagated to the world and utilized by the
skylake-driver carry shortcomings in their SectionGraphs.

Since commit daa480bd ("ASoC: soc-core: tidyup for
snd_soc_dapm_add_routes()") route checks are no longer permissive. Probe
failures for Intel boards have been partially addressed by commit
a22ae72b ("ASoC: soc-core: disable route checks for legacy devices")
and its follow up but only skl_nau88l25_ssm4567.c is patched. Fix the
problem for the rest of the boards.

Link: https://lore.kernel.org/all/20200309192744.18380-1-pierre-louis.bossart@linux.intel.com/


Fixes: daa480bd ("ASoC: soc-core: tidyup for snd_soc_dapm_add_routes()")
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240308090502.2136760-2-cezary.rojewski@intel.com


Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4cece764

sound/soc/intel/boards/bxt_da7219_max98357a.c

+1 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ static struct snd_soc_card broxton_audio_card = { 
	.dapm_routes = audio_map,

	.num_dapm_routes = ARRAY_SIZE(audio_map),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = bxt_card_late_probe,

};

sound/soc/intel/boards/bxt_rt298.c

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ static struct snd_soc_card broxton_rt298 = { 
	.dapm_routes = broxton_rt298_map,

	.num_dapm_routes = ARRAY_SIZE(broxton_rt298_map),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = bxt_card_late_probe,



};

sound/soc/intel/boards/glk_rt5682_max98357a.c

+2 −0
Original line number Diff line number Diff line
@@ -649,6 +649,8 @@ static int geminilake_audio_probe(struct platform_device *pdev) 
	card = &glk_audio_card_rt5682_m98357a;

	card->dev = &pdev->dev;

	snd_soc_card_set_drvdata(card, ctx);

	if (!snd_soc_acpi_sof_parent(&pdev->dev))

		card->disable_route_checks = true;



	/* override platform name, if required */

	mach = pdev->dev.platform_data;

sound/soc/intel/boards/kbl_da7219_max98357a.c

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ static struct snd_soc_card kabylake_audio_card_da7219_m98357a = { 
	.dapm_routes = kabylake_map,

	.num_dapm_routes = ARRAY_SIZE(kabylake_map),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = kabylake_card_late_probe,

};

sound/soc/intel/boards/kbl_da7219_max98927.c

+4 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,7 @@ static struct snd_soc_card kbl_audio_card_da7219_m98927 = { 
	.codec_conf = max98927_codec_conf,

	.num_configs = ARRAY_SIZE(max98927_codec_conf),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = kabylake_card_late_probe,

};
@@ -1054,6 +1055,7 @@ static struct snd_soc_card kbl_audio_card_max98927 = { 
	.codec_conf = max98927_codec_conf,

	.num_configs = ARRAY_SIZE(max98927_codec_conf),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = kabylake_card_late_probe,

};
@@ -1071,6 +1073,7 @@ static struct snd_soc_card kbl_audio_card_da7219_m98373 = { 
	.codec_conf = max98373_codec_conf,

	.num_configs = ARRAY_SIZE(max98373_codec_conf),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = kabylake_card_late_probe,

};
@@ -1088,6 +1091,7 @@ static struct snd_soc_card kbl_audio_card_max98373 = { 
	.codec_conf = max98373_codec_conf,

	.num_configs = ARRAY_SIZE(max98373_codec_conf),

	.fully_routed = true,

	.disable_route_checks = true,

	.late_probe = kabylake_card_late_probe,

};