Merge remote-tracking branches 'asoc/topic/ak5386', 'asoc/topic/ak5558', 'asoc/topic...

[linux.git] / sound / soc / amd / acp.h

diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h
index ecb458935d1e82607f907c9105ccaac20411f8ce..ba01510eb818b7079fc633d575199daf436fb449 100644 (file)
--- a/sound/soc/amd/acp.h
+++ b/sound/soc/amd/acp.h
@@ -70,6 +70,8 @@
 #define CAPTURE_END_DMA_DESCR_CH15 7
 
 #define mmACP_I2S_16BIT_RESOLUTION_EN       0x5209
+#define ACP_I2S_MIC_16BIT_RESOLUTION_EN 0x01
+#define ACP_I2S_SP_16BIT_RESOLUTION_EN 0x02
 enum acp_dma_priority_level {
        /* 0x0 Specifies the DMA channel is given normal priority */
        ACP_DMA_PRIORITY_LEVEL_NORMAL = 0x0,
@@ -84,14 +86,14 @@ struct audio_substream_data {
        u16 num_of_pages;
        u16 direction;
        uint64_t size;
-       u64 renderbytescount;
-       u64 capturebytescount;
+       u64 i2ssp_renderbytescount;
+       u64 i2ssp_capturebytescount;
        void __iomem *acp_mmio;
 };
 
 struct audio_drv_data {
-       struct snd_pcm_substream *play_stream;
-       struct snd_pcm_substream *capture_stream;
+       struct snd_pcm_substream *play_i2ssp_stream;
+       struct snd_pcm_substream *capture_i2ssp_stream;
        void __iomem *acp_mmio;
        u32 asic_type;
 };