ASoC: Intel: Disable route checks for Skylake boards
[ Upstream commit 0cb3b7fd530b8c107443218ce6db5cb6e7b5dbe1 ] Topology files that are propagated to the world and utilized by the skylake-driver carry shortcomings in their SectionGraphs. Since commit daa480bde6b3 ("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 a22ae72b86a4 ("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: daa480bde6b3 ("ASoC: soc-core: tidyup for snd_soc_dapm_add_routes()") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://msgid.link/r/20240308090502.2136760-2-cezary.rojewski@intel.com Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4a81b749a4
commit
d00ea585f8
11 changed files with 17 additions and 0 deletions
|
@ -750,6 +750,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,
|
||||
};
|
||||
|
||||
|
|
|
@ -575,6 +575,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,
|
||||
|
||||
};
|
||||
|
|
|
@ -603,6 +603,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 plaform name, if required */
|
||||
mach = pdev->dev.platform_data;
|
||||
|
|
|
@ -571,6 +571,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,
|
||||
};
|
||||
|
||||
|
|
|
@ -1016,6 +1016,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,
|
||||
};
|
||||
|
||||
|
@ -1034,6 +1035,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,
|
||||
};
|
||||
|
||||
|
@ -1051,6 +1053,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,
|
||||
};
|
||||
|
||||
|
@ -1068,6 +1071,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,
|
||||
};
|
||||
|
||||
|
|
|
@ -519,6 +519,7 @@ static struct snd_soc_card kabylake_audio_card_rt5660 = {
|
|||
.dapm_routes = kabylake_rt5660_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(kabylake_rt5660_map),
|
||||
.fully_routed = true,
|
||||
.disable_route_checks = true,
|
||||
.late_probe = kabylake_card_late_probe,
|
||||
};
|
||||
|
||||
|
|
|
@ -948,6 +948,7 @@ static struct snd_soc_card kabylake_audio_card_rt5663_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,
|
||||
};
|
||||
|
||||
|
@ -964,6 +965,7 @@ static struct snd_soc_card kabylake_audio_card_rt5663 = {
|
|||
.dapm_routes = kabylake_5663_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(kabylake_5663_map),
|
||||
.fully_routed = true,
|
||||
.disable_route_checks = true,
|
||||
.late_probe = kabylake_card_late_probe,
|
||||
};
|
||||
|
||||
|
|
|
@ -779,6 +779,7 @@ static struct snd_soc_card kabylake_audio_card = {
|
|||
.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,
|
||||
};
|
||||
|
||||
|
|
|
@ -229,6 +229,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
|
|||
ctx->common_hdmi_codec_drv = mach->mach_params.common_hdmi_codec_drv;
|
||||
|
||||
hda_soc_card.dev = &pdev->dev;
|
||||
if (!snd_soc_acpi_sof_parent(&pdev->dev))
|
||||
hda_soc_card.disable_route_checks = true;
|
||||
|
||||
if (mach->mach_params.dmic_num > 0) {
|
||||
snprintf(hda_soc_components, sizeof(hda_soc_components),
|
||||
|
|
|
@ -643,6 +643,7 @@ static struct snd_soc_card skylake_audio_card = {
|
|||
.dapm_routes = skylake_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(skylake_map),
|
||||
.fully_routed = true,
|
||||
.disable_route_checks = true,
|
||||
.late_probe = skylake_card_late_probe,
|
||||
};
|
||||
|
||||
|
|
|
@ -524,6 +524,7 @@ static struct snd_soc_card skylake_rt286 = {
|
|||
.dapm_routes = skylake_rt286_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(skylake_rt286_map),
|
||||
.fully_routed = true,
|
||||
.disable_route_checks = true,
|
||||
.late_probe = skylake_card_late_probe,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue