|
@@ -3595,15 +3595,18 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);
|
|
EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);
|
|
|
|
|
|
-void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
|
|
|
|
|
|
+void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
|
|
|
|
+ struct device_node *np,
|
|
struct snd_soc_codec_conf *codec_conf,
|
|
struct snd_soc_codec_conf *codec_conf,
|
|
struct device_node *of_node,
|
|
struct device_node *of_node,
|
|
const char *propname)
|
|
const char *propname)
|
|
{
|
|
{
|
|
- struct device_node *np = card->dev->of_node;
|
|
|
|
const char *str;
|
|
const char *str;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
|
|
+ if (!np)
|
|
|
|
+ np = card->dev->of_node;
|
|
|
|
+
|
|
ret = of_property_read_string(np, propname, &str);
|
|
ret = of_property_read_string(np, propname, &str);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
/* no prefix is not error */
|
|
/* no prefix is not error */
|
|
@@ -3613,7 +3616,7 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
|
|
codec_conf->of_node = of_node;
|
|
codec_conf->of_node = of_node;
|
|
codec_conf->name_prefix = str;
|
|
codec_conf->name_prefix = str;
|
|
}
|
|
}
|
|
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);
|
|
|
|
|
|
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);
|
|
|
|
|
|
int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
|
|
int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
|
|
struct device_node *np,
|
|
struct device_node *np,
|