Merge remote-tracking branch 'asoc/topic/of' into asoc-next

2 files changed, 3 insertions, 1 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e30a00c14196..3d84808952b9 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -45,7 +45,7 @@ struct snd_compr_stream;
  * sending or receiving PCM data in a frame. This can be used to save power.
  */
 #define SND_SOC_DAIFMT_CONT             (1 << 4) /* continuous clock */
-#define SND_SOC_DAIFMT_GATED            (2 << 4) /* clock is gated */
+#define SND_SOC_DAIFMT_GATED            (0 << 4) /* clock is gated */
 
 /*
  * DAI hardware signal inversions.
diff --git a/include/sound/soc.h b/include/sound/soc.h
index c76d0242c2a8..a6a059ca3874 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1171,6 +1171,8 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,
                                const char *propname);
 int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname);
+unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
+                                     const char *prefix);
 
 #include <sound/soc-dai.h>