Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / sound / soc / fsl / fsl_spdif.h

diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h
index 16fde4b927d386eb98a69518c8bca332698de6bd..00bd3514c610a950e204130dd8ea103d94e251cf 100644 (file)
--- a/sound/soc/fsl/fsl_spdif.h
+++ b/sound/soc/fsl/fsl_spdif.h
@@ -93,6 +93,8 @@
 #define SCR_USRC_SEL_RECV              (0x1 << SCR_USRC_SEL_OFFSET)
 #define SCR_USRC_SEL_CHIP              (0x3 << SCR_USRC_SEL_OFFSET)
 
+#define SCR_DMA_xX_EN(tx)              (tx ? SCR_DMA_TX_EN : SCR_DMA_RX_EN)
+
 /* SPDIF CDText control */
 #define SRCD_CD_USER_OFFSET            1
 #define SRCD_CD_USER                   (1 << SRCD_CD_USER_OFFSET)
@@ -164,8 +166,10 @@ enum spdif_txrate {
        SPDIF_TXRATE_32000 = 0,
        SPDIF_TXRATE_44100,
        SPDIF_TXRATE_48000,
+       SPDIF_TXRATE_96000,
+       SPDIF_TXRATE_192000,
 };
-#define SPDIF_TXRATE_MAX               (SPDIF_TXRATE_48000 + 1)
+#define SPDIF_TXRATE_MAX               (SPDIF_TXRATE_192000 + 1)
 
 
 #define SPDIF_CSTATUS_BYTE             6
@@ -175,7 +179,9 @@ enum spdif_txrate {
 
 #define FSL_SPDIF_RATES_PLAYBACK       (SNDRV_PCM_RATE_32000 | \
                                         SNDRV_PCM_RATE_44100 | \
-                                        SNDRV_PCM_RATE_48000)
+                                        SNDRV_PCM_RATE_48000 | \
+                                        SNDRV_PCM_RATE_96000 | \
+                                        SNDRV_PCM_RATE_192000)
 
 #define FSL_SPDIF_RATES_CAPTURE                (SNDRV_PCM_RATE_16000 | \
                                         SNDRV_PCM_RATE_32000 | \