diff options
Diffstat (limited to 'include/sound/soc-dai.h')
-rw-r--r-- | include/sound/soc-dai.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 3953cea0ecfb..3d84808952b9 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -45,7 +45,7 @@ struct snd_compr_stream; | |||
45 | * sending or receiving PCM data in a frame. This can be used to save power. | 45 | * sending or receiving PCM data in a frame. This can be used to save power. |
46 | */ | 46 | */ |
47 | #define SND_SOC_DAIFMT_CONT (1 << 4) /* continuous clock */ | 47 | #define SND_SOC_DAIFMT_CONT (1 << 4) /* continuous clock */ |
48 | #define SND_SOC_DAIFMT_GATED (2 << 4) /* clock is gated */ | 48 | #define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */ |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * DAI hardware signal inversions. | 51 | * DAI hardware signal inversions. |
@@ -53,7 +53,7 @@ struct snd_compr_stream; | |||
53 | * Specifies whether the DAI can also support inverted clocks for the specified | 53 | * Specifies whether the DAI can also support inverted clocks for the specified |
54 | * format. | 54 | * format. |
55 | */ | 55 | */ |
56 | #define SND_SOC_DAIFMT_NB_NF (1 << 8) /* normal bit clock + frame */ | 56 | #define SND_SOC_DAIFMT_NB_NF (0 << 8) /* normal bit clock + frame */ |
57 | #define SND_SOC_DAIFMT_NB_IF (2 << 8) /* normal BCLK + inv FRM */ | 57 | #define SND_SOC_DAIFMT_NB_IF (2 << 8) /* normal BCLK + inv FRM */ |
58 | #define SND_SOC_DAIFMT_IB_NF (3 << 8) /* invert BCLK + nor FRM */ | 58 | #define SND_SOC_DAIFMT_IB_NF (3 << 8) /* invert BCLK + nor FRM */ |
59 | #define SND_SOC_DAIFMT_IB_IF (4 << 8) /* invert BCLK + FRM */ | 59 | #define SND_SOC_DAIFMT_IB_IF (4 << 8) /* invert BCLK + FRM */ |
@@ -126,7 +126,8 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai, | |||
126 | int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); | 126 | int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); |
127 | 127 | ||
128 | /* Digital Audio Interface mute */ | 128 | /* Digital Audio Interface mute */ |
129 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute); | 129 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, |
130 | int direction); | ||
130 | 131 | ||
131 | struct snd_soc_dai_ops { | 132 | struct snd_soc_dai_ops { |
132 | /* | 133 | /* |
@@ -157,6 +158,7 @@ struct snd_soc_dai_ops { | |||
157 | * Called by soc-core to minimise any pops. | 158 | * Called by soc-core to minimise any pops. |
158 | */ | 159 | */ |
159 | int (*digital_mute)(struct snd_soc_dai *dai, int mute); | 160 | int (*digital_mute)(struct snd_soc_dai *dai, int mute); |
161 | int (*mute_stream)(struct snd_soc_dai *dai, int mute, int stream); | ||
160 | 162 | ||
161 | /* | 163 | /* |
162 | * ALSA PCM audio operations - all optional. | 164 | * ALSA PCM audio operations - all optional. |