diff options
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/cs42l73.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/cs42l73.h | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 5544f1417a25..672da66dc662 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c | |||
@@ -1028,13 +1028,13 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) | |||
1028 | switch (format) { | 1028 | switch (format) { |
1029 | case SND_SOC_DAIFMT_DSP_B: | 1029 | case SND_SOC_DAIFMT_DSP_B: |
1030 | if (inv == SND_SOC_DAIFMT_IB_IF) | 1030 | if (inv == SND_SOC_DAIFMT_IB_IF) |
1031 | spc |= (PCM_MODE0 << 4); | 1031 | spc |= PCM_MODE0; |
1032 | if (inv == SND_SOC_DAIFMT_IB_NF) | 1032 | if (inv == SND_SOC_DAIFMT_IB_NF) |
1033 | spc |= (PCM_MODE1 << 4); | 1033 | spc |= PCM_MODE1; |
1034 | break; | 1034 | break; |
1035 | case SND_SOC_DAIFMT_DSP_A: | 1035 | case SND_SOC_DAIFMT_DSP_A: |
1036 | if (inv == SND_SOC_DAIFMT_IB_IF) | 1036 | if (inv == SND_SOC_DAIFMT_IB_IF) |
1037 | spc |= (PCM_MODE1 << 4); | 1037 | spc |= PCM_MODE1; |
1038 | break; | 1038 | break; |
1039 | default: | 1039 | default: |
1040 | return -EINVAL; | 1040 | return -EINVAL; |
diff --git a/sound/soc/codecs/cs42l73.h b/sound/soc/codecs/cs42l73.h index 7c3bf7fd2f99..f30a4c4d62e6 100644 --- a/sound/soc/codecs/cs42l73.h +++ b/sound/soc/codecs/cs42l73.h | |||
@@ -162,16 +162,16 @@ | |||
162 | 162 | ||
163 | /* CS42L73_ASPC, CS42L73_XSPC, CS42L73_VSPC */ | 163 | /* CS42L73_ASPC, CS42L73_XSPC, CS42L73_VSPC */ |
164 | #define SP_3ST (1 << 7) | 164 | #define SP_3ST (1 << 7) |
165 | #define SPDIF_I2S 0 | 165 | #define SPDIF_I2S (0 << 6) |
166 | #define SPDIF_PCM (1 << 6) | 166 | #define SPDIF_PCM (1 << 6) |
167 | #define PCM_MODE0 0 | 167 | #define PCM_MODE0 (0 << 4) |
168 | #define PCM_MODE1 1 | 168 | #define PCM_MODE1 (1 << 4) |
169 | #define PCM_MODE2 2 | 169 | #define PCM_MODE2 (2 << 4) |
170 | #define PCM_BO_MSBLSB 0 | 170 | #define PCM_MODE_MASK (3 << 4) |
171 | #define PCM_BO_LSBMSB 1 | 171 | #define PCM_BIT_ORDER (1 << 3) |
172 | #define MCK_SCLK_64FS 0 | 172 | #define MCK_SCLK_64FS (0 << 0) |
173 | #define MCK_SCLK_MCLK 2 | 173 | #define MCK_SCLK_MCLK (2 << 0) |
174 | #define MCK_SCLK_PREMCLK 3 | 174 | #define MCK_SCLK_PREMCLK (3 << 0) |
175 | 175 | ||
176 | /* CS42L73_xSPMMCC */ | 176 | /* CS42L73_xSPMMCC */ |
177 | #define MS_MASTER (1 << 7) | 177 | #define MS_MASTER (1 << 7) |