ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a8b4b9c8b1d2415e7220913715fc2cd4bd95212c..adb2eba0a2112d78dc1e4aadb1997774b3cd3e8d 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1638,6 +1638,8 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                     const char *prefix,
                                     struct device_node **bitclkmaster,
                                     struct device_node **framemaster);
+int snd_soc_get_dai_name(struct of_phandle_args *args,
+                        const char **dai_name);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                            const char **dai_name);
 int snd_soc_of_get_dai_link_codecs(struct device *dev,
@@ -1655,7 +1657,7 @@ extern const struct dev_pm_ops snd_soc_pm_ops;
 /* Helper functions */
 static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm)
 {
-       mutex_lock(&dapm->card->dapm_mutex);
+       mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 }
 
 static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)