diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:38 +0000 |
| commit | 556d8b55d083ad487067680feaf179664172bd4e (patch) | |
| tree | 36005d676bd1b7aeb4f3ff7dcda3f22bde051161 /include/sound | |
| parent | f0f3214e8be1068121ba829fcd8c1c22b5bd6975 (diff) | |
| parent | 8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21 (diff) | |
| download | linux-exynos-556d8b55d083ad487067680feaf179664172bd4e.tar.gz linux-exynos-556d8b55d083ad487067680feaf179664172bd4e.tar.bz2 linux-exynos-556d8b55d083ad487067680feaf179664172bd4e.zip | |
Merge remote-tracking branch 'asoc/topic/of' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 |
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> |