Merge "dsp: add senary MI2S and TDM port IDs"

This commit is contained in:
qctecmdr
2019-05-21 20:36:45 -07:00
committed by Gerrit - the friendly Code Review server
4 changed files with 234 additions and 13 deletions

View File

@@ -911,6 +911,8 @@ int afe_sizeof_cfg_cmd(u16 port_id)
case AFE_PORT_ID_QUATERNARY_MI2S_TX: case AFE_PORT_ID_QUATERNARY_MI2S_TX:
case AFE_PORT_ID_QUINARY_MI2S_RX: case AFE_PORT_ID_QUINARY_MI2S_RX:
case AFE_PORT_ID_QUINARY_MI2S_TX: case AFE_PORT_ID_QUINARY_MI2S_TX:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX:
ret_size = SIZEOF_CFG_CMD(afe_param_id_i2s_cfg); ret_size = SIZEOF_CFG_CMD(afe_param_id_i2s_cfg);
break; break;
case HDMI_RX: case HDMI_RX:
@@ -4489,6 +4491,7 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
case AFE_PORT_ID_QUATERNARY_MI2S_TX: case AFE_PORT_ID_QUATERNARY_MI2S_TX:
case AFE_PORT_ID_QUINARY_MI2S_RX: case AFE_PORT_ID_QUINARY_MI2S_RX:
case AFE_PORT_ID_QUINARY_MI2S_TX: case AFE_PORT_ID_QUINARY_MI2S_TX:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
case AFE_PORT_ID_INT0_MI2S_RX: case AFE_PORT_ID_INT0_MI2S_RX:
case AFE_PORT_ID_INT0_MI2S_TX: case AFE_PORT_ID_INT0_MI2S_TX:
@@ -4817,6 +4820,8 @@ int afe_get_port_index(u16 port_id)
return IDX_AFE_PORT_ID_QUINARY_MI2S_RX; return IDX_AFE_PORT_ID_QUINARY_MI2S_RX;
case AFE_PORT_ID_QUINARY_MI2S_TX: case AFE_PORT_ID_QUINARY_MI2S_TX:
return IDX_AFE_PORT_ID_QUINARY_MI2S_TX; return IDX_AFE_PORT_ID_QUINARY_MI2S_TX;
case AFE_PORT_ID_SENARY_MI2S_RX:
return IDX_AFE_PORT_ID_SENARY_MI2S_RX;
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
return IDX_AFE_PORT_ID_SENARY_MI2S_TX; return IDX_AFE_PORT_ID_SENARY_MI2S_TX;
case AFE_PORT_ID_PRIMARY_TDM_RX: case AFE_PORT_ID_PRIMARY_TDM_RX:
@@ -4979,6 +4984,38 @@ int afe_get_port_index(u16 port_id)
return IDX_AFE_PORT_ID_QUINARY_TDM_RX_7; return IDX_AFE_PORT_ID_QUINARY_TDM_RX_7;
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
return IDX_AFE_PORT_ID_QUINARY_TDM_TX_7; return IDX_AFE_PORT_ID_QUINARY_TDM_TX_7;
case AFE_PORT_ID_SENARY_TDM_RX:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_0;
case AFE_PORT_ID_SENARY_TDM_TX:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_0;
case AFE_PORT_ID_SENARY_TDM_RX_1:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_1;
case AFE_PORT_ID_SENARY_TDM_TX_1:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_1;
case AFE_PORT_ID_SENARY_TDM_RX_2:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_2;
case AFE_PORT_ID_SENARY_TDM_TX_2:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_2;
case AFE_PORT_ID_SENARY_TDM_RX_3:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_3;
case AFE_PORT_ID_SENARY_TDM_TX_3:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_3;
case AFE_PORT_ID_SENARY_TDM_RX_4:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_4;
case AFE_PORT_ID_SENARY_TDM_TX_4:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_4;
case AFE_PORT_ID_SENARY_TDM_RX_5:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_5;
case AFE_PORT_ID_SENARY_TDM_TX_5:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_5;
case AFE_PORT_ID_SENARY_TDM_RX_6:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_6;
case AFE_PORT_ID_SENARY_TDM_TX_6:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_6;
case AFE_PORT_ID_SENARY_TDM_RX_7:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_7;
case AFE_PORT_ID_SENARY_TDM_TX_7:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_7;
case AFE_PORT_ID_INT0_MI2S_RX: case AFE_PORT_ID_INT0_MI2S_RX:
return IDX_AFE_PORT_ID_INT0_MI2S_RX; return IDX_AFE_PORT_ID_INT0_MI2S_RX;
case AFE_PORT_ID_INT0_MI2S_TX: case AFE_PORT_ID_INT0_MI2S_TX:
@@ -5166,6 +5203,7 @@ int afe_open(u16 port_id,
case MI2S_TX: case MI2S_TX:
case AFE_PORT_ID_QUINARY_MI2S_RX: case AFE_PORT_ID_QUINARY_MI2S_RX:
case AFE_PORT_ID_QUINARY_MI2S_TX: case AFE_PORT_ID_QUINARY_MI2S_TX:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
cfg_type = AFE_PARAM_ID_I2S_CONFIG; cfg_type = AFE_PARAM_ID_I2S_CONFIG;
break; break;
@@ -5535,6 +5573,8 @@ int afe_port_group_set_param(u16 group_id,
case AFE_GROUP_DEVICE_ID_QUATERNARY_TDM_TX: case AFE_GROUP_DEVICE_ID_QUATERNARY_TDM_TX:
case AFE_GROUP_DEVICE_ID_QUINARY_TDM_RX: case AFE_GROUP_DEVICE_ID_QUINARY_TDM_RX:
case AFE_GROUP_DEVICE_ID_QUINARY_TDM_TX: case AFE_GROUP_DEVICE_ID_QUINARY_TDM_TX:
case AFE_GROUP_DEVICE_ID_SENARY_TDM_RX:
case AFE_GROUP_DEVICE_ID_SENARY_TDM_TX:
cfg_type = AFE_PARAM_ID_GROUP_DEVICE_TDM_CONFIG; cfg_type = AFE_PARAM_ID_GROUP_DEVICE_TDM_CONFIG;
break; break;
default: default:
@@ -7086,6 +7126,8 @@ int afe_validate_port(u16 port_id)
case AFE_PORT_ID_QUATERNARY_PCM_TX: case AFE_PORT_ID_QUATERNARY_PCM_TX:
case AFE_PORT_ID_QUINARY_PCM_RX: case AFE_PORT_ID_QUINARY_PCM_RX:
case AFE_PORT_ID_QUINARY_PCM_TX: case AFE_PORT_ID_QUINARY_PCM_TX:
case AFE_PORT_ID_SENARY_PCM_RX:
case AFE_PORT_ID_SENARY_PCM_TX:
case SECONDARY_I2S_RX: case SECONDARY_I2S_RX:
case SECONDARY_I2S_TX: case SECONDARY_I2S_TX:
case MI2S_RX: case MI2S_RX:
@@ -7140,6 +7182,7 @@ int afe_validate_port(u16 port_id)
case AFE_PORT_ID_TERTIARY_MI2S_TX: case AFE_PORT_ID_TERTIARY_MI2S_TX:
case AFE_PORT_ID_QUINARY_MI2S_RX: case AFE_PORT_ID_QUINARY_MI2S_RX:
case AFE_PORT_ID_QUINARY_MI2S_TX: case AFE_PORT_ID_QUINARY_MI2S_TX:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
case AFE_PORT_ID_PRIMARY_TDM_RX: case AFE_PORT_ID_PRIMARY_TDM_RX:
case AFE_PORT_ID_PRIMARY_TDM_TX: case AFE_PORT_ID_PRIMARY_TDM_TX:
@@ -7221,6 +7264,22 @@ int afe_validate_port(u16 port_id)
case AFE_PORT_ID_QUINARY_TDM_TX_6: case AFE_PORT_ID_QUINARY_TDM_TX_6:
case AFE_PORT_ID_QUINARY_TDM_RX_7: case AFE_PORT_ID_QUINARY_TDM_RX_7:
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
case AFE_PORT_ID_SENARY_TDM_RX:
case AFE_PORT_ID_SENARY_TDM_TX:
case AFE_PORT_ID_SENARY_TDM_RX_1:
case AFE_PORT_ID_SENARY_TDM_TX_1:
case AFE_PORT_ID_SENARY_TDM_RX_2:
case AFE_PORT_ID_SENARY_TDM_TX_2:
case AFE_PORT_ID_SENARY_TDM_RX_3:
case AFE_PORT_ID_SENARY_TDM_TX_3:
case AFE_PORT_ID_SENARY_TDM_RX_4:
case AFE_PORT_ID_SENARY_TDM_TX_4:
case AFE_PORT_ID_SENARY_TDM_RX_5:
case AFE_PORT_ID_SENARY_TDM_TX_5:
case AFE_PORT_ID_SENARY_TDM_RX_6:
case AFE_PORT_ID_SENARY_TDM_TX_6:
case AFE_PORT_ID_SENARY_TDM_RX_7:
case AFE_PORT_ID_SENARY_TDM_TX_7:
case AFE_PORT_ID_INT0_MI2S_RX: case AFE_PORT_ID_INT0_MI2S_RX:
case AFE_PORT_ID_INT1_MI2S_RX: case AFE_PORT_ID_INT1_MI2S_RX:
case AFE_PORT_ID_INT2_MI2S_RX: case AFE_PORT_ID_INT2_MI2S_RX:

View File

@@ -269,6 +269,40 @@ int q6audio_get_port_index(u16 port_id)
return IDX_AFE_PORT_ID_QUINARY_TDM_RX_7; return IDX_AFE_PORT_ID_QUINARY_TDM_RX_7;
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
return IDX_AFE_PORT_ID_QUINARY_TDM_TX_7; return IDX_AFE_PORT_ID_QUINARY_TDM_TX_7;
case AFE_PORT_ID_SENARY_TDM_RX:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_0;
case AFE_PORT_ID_SENARY_TDM_TX:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_0;
case AFE_PORT_ID_SENARY_TDM_RX_1:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_1;
case AFE_PORT_ID_SENARY_TDM_TX_1:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_1;
case AFE_PORT_ID_SENARY_TDM_RX_2:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_2;
case AFE_PORT_ID_SENARY_TDM_TX_2:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_2;
case AFE_PORT_ID_SENARY_TDM_RX_3:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_3;
case AFE_PORT_ID_SENARY_TDM_TX_3:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_3;
case AFE_PORT_ID_SENARY_TDM_RX_4:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_4;
case AFE_PORT_ID_SENARY_TDM_TX_4:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_4;
case AFE_PORT_ID_SENARY_TDM_RX_5:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_5;
case AFE_PORT_ID_SENARY_TDM_TX_5:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_5;
case AFE_PORT_ID_SENARY_TDM_RX_6:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_6;
case AFE_PORT_ID_SENARY_TDM_TX_6:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_6;
case AFE_PORT_ID_SENARY_TDM_RX_7:
return IDX_AFE_PORT_ID_SENARY_TDM_RX_7;
case AFE_PORT_ID_SENARY_TDM_TX_7:
return IDX_AFE_PORT_ID_SENARY_TDM_TX_7;
case AFE_PORT_ID_SENARY_MI2S_RX:
return IDX_AFE_PORT_ID_SENARY_MI2S_RX;
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
return IDX_AFE_PORT_ID_SENARY_MI2S_TX; return IDX_AFE_PORT_ID_SENARY_MI2S_TX;
case AFE_PORT_ID_USB_RX: case AFE_PORT_ID_USB_RX:
@@ -613,6 +647,40 @@ int q6audio_get_port_id(u16 port_id)
return AFE_PORT_ID_QUINARY_TDM_RX_7; return AFE_PORT_ID_QUINARY_TDM_RX_7;
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
return AFE_PORT_ID_QUINARY_TDM_TX_7; return AFE_PORT_ID_QUINARY_TDM_TX_7;
case AFE_PORT_ID_SENARY_TDM_RX:
return AFE_PORT_ID_SENARY_TDM_RX;
case AFE_PORT_ID_SENARY_TDM_TX:
return AFE_PORT_ID_SENARY_TDM_TX;
case AFE_PORT_ID_SENARY_TDM_RX_1:
return AFE_PORT_ID_SENARY_TDM_RX_1;
case AFE_PORT_ID_SENARY_TDM_TX_1:
return AFE_PORT_ID_SENARY_TDM_TX_1;
case AFE_PORT_ID_SENARY_TDM_RX_2:
return AFE_PORT_ID_SENARY_TDM_RX_2;
case AFE_PORT_ID_SENARY_TDM_TX_2:
return AFE_PORT_ID_SENARY_TDM_TX_2;
case AFE_PORT_ID_SENARY_TDM_RX_3:
return AFE_PORT_ID_SENARY_TDM_RX_3;
case AFE_PORT_ID_SENARY_TDM_TX_3:
return AFE_PORT_ID_SENARY_TDM_TX_3;
case AFE_PORT_ID_SENARY_TDM_RX_4:
return AFE_PORT_ID_SENARY_TDM_RX_4;
case AFE_PORT_ID_SENARY_TDM_TX_4:
return AFE_PORT_ID_SENARY_TDM_TX_4;
case AFE_PORT_ID_SENARY_TDM_RX_5:
return AFE_PORT_ID_SENARY_TDM_RX_5;
case AFE_PORT_ID_SENARY_TDM_TX_5:
return AFE_PORT_ID_SENARY_TDM_TX_5;
case AFE_PORT_ID_SENARY_TDM_RX_6:
return AFE_PORT_ID_SENARY_TDM_RX_6;
case AFE_PORT_ID_SENARY_TDM_TX_6:
return AFE_PORT_ID_SENARY_TDM_TX_6;
case AFE_PORT_ID_SENARY_TDM_RX_7:
return AFE_PORT_ID_SENARY_TDM_RX_7;
case AFE_PORT_ID_SENARY_TDM_TX_7:
return AFE_PORT_ID_SENARY_TDM_TX_7;
case AFE_PORT_ID_SENARY_MI2S_RX:
return AFE_PORT_ID_SENARY_MI2S_RX;
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
return AFE_PORT_ID_SENARY_MI2S_TX; return AFE_PORT_ID_SENARY_MI2S_TX;
case AFE_PORT_ID_USB_RX: case AFE_PORT_ID_USB_RX:
@@ -832,6 +900,23 @@ int q6audio_is_digital_pcm_interface(u16 port_id)
case AFE_PORT_ID_QUINARY_TDM_TX_6: case AFE_PORT_ID_QUINARY_TDM_TX_6:
case AFE_PORT_ID_QUINARY_TDM_RX_7: case AFE_PORT_ID_QUINARY_TDM_RX_7:
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
case AFE_PORT_ID_SENARY_TDM_RX:
case AFE_PORT_ID_SENARY_TDM_TX:
case AFE_PORT_ID_SENARY_TDM_RX_1:
case AFE_PORT_ID_SENARY_TDM_TX_1:
case AFE_PORT_ID_SENARY_TDM_RX_2:
case AFE_PORT_ID_SENARY_TDM_TX_2:
case AFE_PORT_ID_SENARY_TDM_RX_3:
case AFE_PORT_ID_SENARY_TDM_TX_3:
case AFE_PORT_ID_SENARY_TDM_RX_4:
case AFE_PORT_ID_SENARY_TDM_TX_4:
case AFE_PORT_ID_SENARY_TDM_RX_5:
case AFE_PORT_ID_SENARY_TDM_TX_5:
case AFE_PORT_ID_SENARY_TDM_RX_6:
case AFE_PORT_ID_SENARY_TDM_TX_6:
case AFE_PORT_ID_SENARY_TDM_RX_7:
case AFE_PORT_ID_SENARY_TDM_TX_7:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
case AFE_PORT_ID_INT0_MI2S_RX: case AFE_PORT_ID_INT0_MI2S_RX:
case AFE_PORT_ID_INT0_MI2S_TX: case AFE_PORT_ID_INT0_MI2S_TX:
@@ -1043,6 +1128,23 @@ int q6audio_validate_port(u16 port_id)
case AFE_PORT_ID_QUINARY_TDM_TX_6: case AFE_PORT_ID_QUINARY_TDM_TX_6:
case AFE_PORT_ID_QUINARY_TDM_RX_7: case AFE_PORT_ID_QUINARY_TDM_RX_7:
case AFE_PORT_ID_QUINARY_TDM_TX_7: case AFE_PORT_ID_QUINARY_TDM_TX_7:
case AFE_PORT_ID_SENARY_TDM_RX:
case AFE_PORT_ID_SENARY_TDM_TX:
case AFE_PORT_ID_SENARY_TDM_RX_1:
case AFE_PORT_ID_SENARY_TDM_TX_1:
case AFE_PORT_ID_SENARY_TDM_RX_2:
case AFE_PORT_ID_SENARY_TDM_TX_2:
case AFE_PORT_ID_SENARY_TDM_RX_3:
case AFE_PORT_ID_SENARY_TDM_TX_3:
case AFE_PORT_ID_SENARY_TDM_RX_4:
case AFE_PORT_ID_SENARY_TDM_TX_4:
case AFE_PORT_ID_SENARY_TDM_RX_5:
case AFE_PORT_ID_SENARY_TDM_TX_5:
case AFE_PORT_ID_SENARY_TDM_RX_6:
case AFE_PORT_ID_SENARY_TDM_TX_6:
case AFE_PORT_ID_SENARY_TDM_RX_7:
case AFE_PORT_ID_SENARY_TDM_TX_7:
case AFE_PORT_ID_SENARY_MI2S_RX:
case AFE_PORT_ID_SENARY_MI2S_TX: case AFE_PORT_ID_SENARY_MI2S_TX:
case AFE_PORT_ID_USB_RX: case AFE_PORT_ID_USB_RX:
case AFE_PORT_ID_USB_TX: case AFE_PORT_ID_USB_TX:

View File

@@ -1434,7 +1434,7 @@ struct adm_cmd_connect_afe_port_v5 {
/* End of the range of port IDs for TDM devices. */ /* End of the range of port IDs for TDM devices. */
#define AFE_PORT_ID_TDM_PORT_RANGE_END \ #define AFE_PORT_ID_TDM_PORT_RANGE_END \
(AFE_PORT_ID_TDM_PORT_RANGE_START+0x50-1) (AFE_PORT_ID_TDM_PORT_RANGE_START+0x60-1)
/* Size of the range of port IDs for TDM ports. */ /* Size of the range of port IDs for TDM ports. */
#define AFE_PORT_ID_TDM_PORT_RANGE_SIZE \ #define AFE_PORT_ID_TDM_PORT_RANGE_SIZE \
@@ -1830,6 +1830,40 @@ struct adm_cmd_connect_afe_port_v5 {
#define AFE_PORT_ID_QUINARY_TDM_TX_7 \ #define AFE_PORT_ID_QUINARY_TDM_TX_7 \
(AFE_PORT_ID_QUINARY_TDM_TX + 0x0E) (AFE_PORT_ID_QUINARY_TDM_TX + 0x0E)
#define AFE_PORT_ID_SENARY_TDM_RX \
(AFE_PORT_ID_TDM_PORT_RANGE_START + 0x50)
#define AFE_PORT_ID_SENARY_TDM_RX_1 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x02)
#define AFE_PORT_ID_SENARY_TDM_RX_2 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x04)
#define AFE_PORT_ID_SENARY_TDM_RX_3 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x06)
#define AFE_PORT_ID_SENARY_TDM_RX_4 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x08)
#define AFE_PORT_ID_SENARY_TDM_RX_5 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x0A)
#define AFE_PORT_ID_SENARY_TDM_RX_6 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x0C)
#define AFE_PORT_ID_SENARY_TDM_RX_7 \
(AFE_PORT_ID_SENARY_TDM_RX + 0x0E)
#define AFE_PORT_ID_SENARY_TDM_TX \
(AFE_PORT_ID_TDM_PORT_RANGE_START + 0x51)
#define AFE_PORT_ID_SENARY_TDM_TX_1 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x02)
#define AFE_PORT_ID_SENARY_TDM_TX_2 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x04)
#define AFE_PORT_ID_SENARY_TDM_TX_3 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x06)
#define AFE_PORT_ID_SENARY_TDM_TX_4 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x08)
#define AFE_PORT_ID_SENARY_TDM_TX_5 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x0A)
#define AFE_PORT_ID_SENARY_TDM_TX_6 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x0C)
#define AFE_PORT_ID_SENARY_TDM_TX_7 \
(AFE_PORT_ID_SENARY_TDM_TX + 0x0E)
#define AFE_PORT_ID_INVALID 0xFFFF #define AFE_PORT_ID_INVALID 0xFFFF
#define AAC_ENC_MODE_AAC_LC 0x02 #define AAC_ENC_MODE_AAC_LC 0x02
@@ -11381,6 +11415,10 @@ enum afe_lpass_clk_mode {
#define Q6AFE_LPASS_CLK_ID_QUIN_TDM_EBIT 0x209 #define Q6AFE_LPASS_CLK_ID_QUIN_TDM_EBIT 0x209
/** Clock ID for Quinary TDM OSR */ /** Clock ID for Quinary TDM OSR */
#define Q6AFE_LPASS_CLK_ID_QUIN_TDM_OSR 0x20A #define Q6AFE_LPASS_CLK_ID_QUIN_TDM_OSR 0x20A
/** Clock ID for Senary TDM IBIT */
#define Q6AFE_LPASS_CLK_ID_SEN_TDM_IBIT 0x20B
/** Clock ID for Senary TDM EBIT */
#define Q6AFE_LPASS_CLK_ID_SEN_TDM_EBIT 0x20C
/* Clock ID for MCLK1 */ /* Clock ID for MCLK1 */
#define Q6AFE_LPASS_CLK_ID_MCLK_1 0x300 #define Q6AFE_LPASS_CLK_ID_MCLK_1 0x300
@@ -11773,6 +11811,10 @@ struct afe_group_device_group_cfg {
(AFE_PORT_ID_QUINARY_TDM_RX + 0x100) (AFE_PORT_ID_QUINARY_TDM_RX + 0x100)
#define AFE_GROUP_DEVICE_ID_QUINARY_TDM_TX \ #define AFE_GROUP_DEVICE_ID_QUINARY_TDM_TX \
(AFE_PORT_ID_QUINARY_TDM_TX + 0x100) (AFE_PORT_ID_QUINARY_TDM_TX + 0x100)
#define AFE_GROUP_DEVICE_ID_SENARY_TDM_RX \
(AFE_PORT_ID_SENARY_TDM_RX + 0x100)
#define AFE_GROUP_DEVICE_ID_SENARY_TDM_TX \
(AFE_PORT_ID_SENARY_TDM_TX + 0x100)
/* ID of the parameter used by #AFE_MODULE_GROUP_DEVICE to configure the /* ID of the parameter used by #AFE_MODULE_GROUP_DEVICE to configure the
* group device. #AFE_SVC_CMD_SET_PARAM can use this parameter ID. * group device. #AFE_SVC_CMD_SET_PARAM can use this parameter ID.

View File

@@ -110,12 +110,13 @@ enum {
IDX_PRIMARY_SPDIF_RX, IDX_PRIMARY_SPDIF_RX,
IDX_GLOBAL_CFG, IDX_GLOBAL_CFG,
IDX_AUDIO_PORT_ID_I2S_RX, IDX_AUDIO_PORT_ID_I2S_RX,
/* IDX 50->53 */ /* IDX 50->54 */
IDX_AFE_PORT_ID_SECONDARY_MI2S_RX_SD1, IDX_AFE_PORT_ID_SECONDARY_MI2S_RX_SD1,
IDX_AFE_PORT_ID_QUINARY_MI2S_RX, IDX_AFE_PORT_ID_QUINARY_MI2S_RX,
IDX_AFE_PORT_ID_QUINARY_MI2S_TX, IDX_AFE_PORT_ID_QUINARY_MI2S_TX,
IDX_AFE_PORT_ID_SENARY_MI2S_RX,
IDX_AFE_PORT_ID_SENARY_MI2S_TX, IDX_AFE_PORT_ID_SENARY_MI2S_TX,
/* IDX 54->117 */ /* IDX 55->118 */
IDX_AFE_PORT_ID_PRIMARY_TDM_RX_0, IDX_AFE_PORT_ID_PRIMARY_TDM_RX_0,
IDX_AFE_PORT_ID_PRIMARY_TDM_TX_0, IDX_AFE_PORT_ID_PRIMARY_TDM_TX_0,
IDX_AFE_PORT_ID_PRIMARY_TDM_RX_1, IDX_AFE_PORT_ID_PRIMARY_TDM_RX_1,
@@ -180,22 +181,22 @@ enum {
IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_6, IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_6,
IDX_AFE_PORT_ID_QUATERNARY_TDM_RX_7, IDX_AFE_PORT_ID_QUATERNARY_TDM_RX_7,
IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_7, IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_7,
/* IDX 118->121 */ /* IDX 119->122 */
IDX_SLIMBUS_7_RX, IDX_SLIMBUS_7_RX,
IDX_SLIMBUS_7_TX, IDX_SLIMBUS_7_TX,
IDX_SLIMBUS_8_RX, IDX_SLIMBUS_8_RX,
IDX_SLIMBUS_8_TX, IDX_SLIMBUS_8_TX,
/* IDX 122-> 123 */ /* IDX 123-> 124 */
IDX_AFE_PORT_ID_USB_RX, IDX_AFE_PORT_ID_USB_RX,
IDX_AFE_PORT_ID_USB_TX, IDX_AFE_PORT_ID_USB_TX,
/* IDX 124 */ /* IDX 125 */
IDX_DISPLAY_PORT_RX, IDX_DISPLAY_PORT_RX,
/* IDX 125-> 128 */ /* IDX 126-> 129 */
IDX_AFE_PORT_ID_TERTIARY_PCM_RX, IDX_AFE_PORT_ID_TERTIARY_PCM_RX,
IDX_AFE_PORT_ID_TERTIARY_PCM_TX, IDX_AFE_PORT_ID_TERTIARY_PCM_TX,
IDX_AFE_PORT_ID_QUATERNARY_PCM_RX, IDX_AFE_PORT_ID_QUATERNARY_PCM_RX,
IDX_AFE_PORT_ID_QUATERNARY_PCM_TX, IDX_AFE_PORT_ID_QUATERNARY_PCM_TX,
/* IDX 129-> 142 */ /* IDX 130-> 143 */
IDX_AFE_PORT_ID_INT0_MI2S_RX, IDX_AFE_PORT_ID_INT0_MI2S_RX,
IDX_AFE_PORT_ID_INT0_MI2S_TX, IDX_AFE_PORT_ID_INT0_MI2S_TX,
IDX_AFE_PORT_ID_INT1_MI2S_RX, IDX_AFE_PORT_ID_INT1_MI2S_RX,
@@ -210,7 +211,7 @@ enum {
IDX_AFE_PORT_ID_INT5_MI2S_TX, IDX_AFE_PORT_ID_INT5_MI2S_TX,
IDX_AFE_PORT_ID_INT6_MI2S_RX, IDX_AFE_PORT_ID_INT6_MI2S_RX,
IDX_AFE_PORT_ID_INT6_MI2S_TX, IDX_AFE_PORT_ID_INT6_MI2S_TX,
/* IDX 143-> 160 */ /* IDX 144-> 161 */
IDX_AFE_PORT_ID_QUINARY_PCM_RX, IDX_AFE_PORT_ID_QUINARY_PCM_RX,
IDX_AFE_PORT_ID_QUINARY_PCM_TX, IDX_AFE_PORT_ID_QUINARY_PCM_TX,
IDX_AFE_PORT_ID_QUINARY_TDM_RX_0, IDX_AFE_PORT_ID_QUINARY_TDM_RX_0,
@@ -229,7 +230,7 @@ enum {
IDX_AFE_PORT_ID_QUINARY_TDM_TX_6, IDX_AFE_PORT_ID_QUINARY_TDM_TX_6,
IDX_AFE_PORT_ID_QUINARY_TDM_RX_7, IDX_AFE_PORT_ID_QUINARY_TDM_RX_7,
IDX_AFE_PORT_ID_QUINARY_TDM_TX_7, IDX_AFE_PORT_ID_QUINARY_TDM_TX_7,
/* IDX 161 to 182 */ /* IDX 162 to 183 */
IDX_AFE_PORT_ID_WSA_CODEC_DMA_RX_0, IDX_AFE_PORT_ID_WSA_CODEC_DMA_RX_0,
IDX_AFE_PORT_ID_WSA_CODEC_DMA_TX_0, IDX_AFE_PORT_ID_WSA_CODEC_DMA_TX_0,
IDX_AFE_PORT_ID_WSA_CODEC_DMA_RX_1, IDX_AFE_PORT_ID_WSA_CODEC_DMA_RX_1,
@@ -252,17 +253,34 @@ enum {
IDX_AFE_PORT_ID_TX_CODEC_DMA_TX_5, IDX_AFE_PORT_ID_TX_CODEC_DMA_TX_5,
IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_6, IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_6,
IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_7, IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_7,
/* IDX 183 to 185 */ /* IDX 184 to 186 */
IDX_SECONDARY_SPDIF_RX, IDX_SECONDARY_SPDIF_RX,
IDX_PRIMARY_SPDIF_TX, IDX_PRIMARY_SPDIF_TX,
IDX_SECONDARY_SPDIF_TX, IDX_SECONDARY_SPDIF_TX,
/* IDX 186 to 187 */ /* IDX 187 to 188 */
IDX_SLIMBUS_9_RX, IDX_SLIMBUS_9_RX,
IDX_SLIMBUS_9_TX, IDX_SLIMBUS_9_TX,
/* IDX 188 -> 190 */ /* IDX 189 -> 191 */
IDX_AFE_PORT_ID_SENARY_PCM_RX, IDX_AFE_PORT_ID_SENARY_PCM_RX,
IDX_AFE_PORT_ID_SENARY_PCM_TX, IDX_AFE_PORT_ID_SENARY_PCM_TX,
IDX_AFE_LOOPBACK_TX, IDX_AFE_LOOPBACK_TX,
/* IDX 192-> 207 */
IDX_AFE_PORT_ID_SENARY_TDM_RX_0,
IDX_AFE_PORT_ID_SENARY_TDM_TX_0,
IDX_AFE_PORT_ID_SENARY_TDM_RX_1,
IDX_AFE_PORT_ID_SENARY_TDM_TX_1,
IDX_AFE_PORT_ID_SENARY_TDM_RX_2,
IDX_AFE_PORT_ID_SENARY_TDM_TX_2,
IDX_AFE_PORT_ID_SENARY_TDM_RX_3,
IDX_AFE_PORT_ID_SENARY_TDM_TX_3,
IDX_AFE_PORT_ID_SENARY_TDM_RX_4,
IDX_AFE_PORT_ID_SENARY_TDM_TX_4,
IDX_AFE_PORT_ID_SENARY_TDM_RX_5,
IDX_AFE_PORT_ID_SENARY_TDM_TX_5,
IDX_AFE_PORT_ID_SENARY_TDM_RX_6,
IDX_AFE_PORT_ID_SENARY_TDM_TX_6,
IDX_AFE_PORT_ID_SENARY_TDM_RX_7,
IDX_AFE_PORT_ID_SENARY_TDM_TX_7,
AFE_MAX_PORTS AFE_MAX_PORTS
}; };