[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250515153128.147457-2-laurentiumihalcea111@gmail.com>
Date: Thu, 15 May 2025 11:31:26 -0400
From: Laurentiu Mihalcea <laurentiumihalcea111@...il.com>
To: Mark Brown <broonie@...nel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Liam Girdwood <lgirdwood@...il.com>
Cc: linux-kernel@...r.kernel.org,
linux-sound@...r.kernel.org
Subject: [PATCH RFC 1/3] ASoC: re-introduce disable_route_checks flag for OF routes
From: Laurentiu Mihalcea <laurentiu.mihalcea@....com>
The "disable_route_checks" flag was previously removed via commit
dd2395162c07 ("ASoC: remove disable_route_checks") as it wasn't being
used anywhere.
Re-introduce an OF-specific variant of the flag: "disable_of_route_checks"
as this will be used by audio-graph-card2.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@....com>
---
include/sound/soc.h | 1 +
sound/soc/soc-core.c | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 1fffef311c41..e76da038557d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1077,6 +1077,7 @@ struct snd_soc_card {
unsigned int instantiated:1;
unsigned int topology_shortname_created:1;
unsigned int fully_routed:1;
+ unsigned int disable_of_route_checks:1;
unsigned int probed:1;
unsigned int component_chaining:1;
struct device *devres_dev;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 67bebc339148..b14a52d6f550 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2245,8 +2245,16 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
ret = snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
card->num_of_dapm_routes);
- if (ret < 0)
- goto probe_end;
+ if (ret < 0) {
+ if (card->disable_of_route_checks) {
+ ret = 0;
+ dev_info(card->dev,
+ "%s: disable_of_route_checks set, ignoring errors on add_routes\n",
+ __func__);
+ } else {
+ goto probe_end;
+ }
+ }
/* try to set some sane longname if DMI is available */
snd_soc_set_dmi_name(card);
--
2.34.1
Powered by blists - more mailing lists