diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-05 12:27:30 -0700 |
| commit | af46929e6ee7197dfe315af3c5bb5cc75a0aec9c (patch) | |
| tree | 18359b934daf8c7e271930c938bd867a379cace7 /sound/soc/fsl/fsl_spdif.h | |
| parent | 9c6344b3fa547ce7ec78da95134d92d9f9309b31 (diff) | |
| parent | 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd (diff) | |
Merge tag 'v3.15-rc4' into asoc-fsl-spdif
Linux 3.15-rc4
Diffstat (limited to 'sound/soc/fsl/fsl_spdif.h')
| -rw-r--r-- | sound/soc/fsl/fsl_spdif.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h index 18bf8cdc579e..4ec27fcebac7 100644 --- a/sound/soc/fsl/fsl_spdif.h +++ b/sound/soc/fsl/fsl_spdif.h @@ -144,8 +144,8 @@ enum spdif_gainsel { /* SPDIF Clock register */ #define STC_SYSCLK_DIV_OFFSET 11 -#define STC_SYSCLK_DIV_MASK (0x1ff << STC_TXCLK_SRC_OFFSET) -#define STC_SYSCLK_DIV(x) ((((x) - 1) << STC_TXCLK_DIV_OFFSET) & STC_SYSCLK_DIV_MASK) +#define STC_SYSCLK_DIV_MASK (0x1ff << STC_SYSCLK_DIV_OFFSET) +#define STC_SYSCLK_DIV(x) ((((x) - 1) << STC_SYSCLK_DIV_OFFSET) & STC_SYSCLK_DIV_MASK) #define STC_TXCLK_SRC_OFFSET 8 #define STC_TXCLK_SRC_MASK (0x7 << STC_TXCLK_SRC_OFFSET) #define STC_TXCLK_SRC_SET(x) ((x << STC_TXCLK_SRC_OFFSET) & STC_TXCLK_SRC_MASK) |