Merge "asoc: Add DSD over PCM support for csra66x0 codec"

This commit is contained in:
qctecmdr
2019-07-17 05:31:13 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 11 additions and 2 deletions

View File

@@ -301,12 +301,19 @@ struct msm_dai_q6_tdm_dai_data {
* 1: non-linear PCM * 1: non-linear PCM
* 2: PCM data in IEC 60968 container * 2: PCM data in IEC 60968 container
* 3: compressed data in IEC 60958 container * 3: compressed data in IEC 60958 container
* 9: DSD over PCM (DoP) with marker byte
*/ */
static const char *const mi2s_format[] = { static const char *const mi2s_format[] = {
"LPCM", "LPCM",
"Compr", "Compr",
"LPCM-60958", "LPCM-60958",
"Compr-60958" "Compr-60958",
"NA4",
"NA5",
"NA6",
"NA7",
"NA8",
"DSD_DOP_W_MARKER"
}; };
static const char *const mi2s_vi_feed_mono[] = { static const char *const mi2s_vi_feed_mono[] = {
@@ -315,7 +322,7 @@ static const char *const mi2s_vi_feed_mono[] = {
}; };
static const struct soc_enum mi2s_config_enum[] = { static const struct soc_enum mi2s_config_enum[] = {
SOC_ENUM_SINGLE_EXT(4, mi2s_format), SOC_ENUM_SINGLE_EXT(10, mi2s_format),
SOC_ENUM_SINGLE_EXT(2, mi2s_vi_feed_mono), SOC_ENUM_SINGLE_EXT(2, mi2s_vi_feed_mono),
}; };

View File

@@ -2539,6 +2539,7 @@ struct afe_port_data_cmd_rt_proxy_port_read_v2 {
#define AFE_NON_LINEAR_DATA_PACKED_60958 0x3 #define AFE_NON_LINEAR_DATA_PACKED_60958 0x3
#define AFE_GENERIC_COMPRESSED 0x8 #define AFE_GENERIC_COMPRESSED 0x8
#define AFE_LINEAR_PCM_DATA_PACKED_16BIT 0X6 #define AFE_LINEAR_PCM_DATA_PACKED_16BIT 0X6
#define AFE_DSD_DOP_W_MARKER_DATA 0x9
/* This param id is used to configure I2S interface */ /* This param id is used to configure I2S interface */
#define AFE_PARAM_ID_I2S_CONFIG 0x0001020D #define AFE_PARAM_ID_I2S_CONFIG 0x0001020D
@@ -2643,6 +2644,7 @@ struct afe_param_id_i2s_cfg {
* - #NON_LINEAR_DATA * - #NON_LINEAR_DATA
* - #LINEAR_PCM_DATA_PACKED_IN_60958 * - #LINEAR_PCM_DATA_PACKED_IN_60958
* - #NON_LINEAR_DATA_PACKED_IN_60958 * - #NON_LINEAR_DATA_PACKED_IN_60958
* - #AFE_DSD_DOP_W_MARKER_DATA
*/ */
u16 reserved; u16 reserved;
/* This field must be set to zero. */ /* This field must be set to zero. */