dsp: add quinary interface support in q6afe
Add support for quinary interfaces in q6afe. Also,
fix routing for quinary tdm rx port.
Change-Id: I5db68da1cc8bc17bc5e7b743282abf83fb100bbc
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 0289144..8e96f6f 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -495,6 +495,7 @@
case AFE_PORT_ID_SECONDARY_PCM_RX:
case AFE_PORT_ID_TERTIARY_PCM_RX:
case AFE_PORT_ID_QUATERNARY_PCM_RX:
+ case AFE_PORT_ID_QUINARY_PCM_RX:
case AFE_PORT_ID_PRIMARY_TDM_RX:
case AFE_PORT_ID_PRIMARY_TDM_RX_1:
case AFE_PORT_ID_PRIMARY_TDM_RX_2:
@@ -527,6 +528,14 @@
case AFE_PORT_ID_QUATERNARY_TDM_RX_5:
case AFE_PORT_ID_QUATERNARY_TDM_RX_6:
case AFE_PORT_ID_QUATERNARY_TDM_RX_7:
+ case AFE_PORT_ID_QUINARY_TDM_RX:
+ case AFE_PORT_ID_QUINARY_TDM_RX_1:
+ case AFE_PORT_ID_QUINARY_TDM_RX_2:
+ case AFE_PORT_ID_QUINARY_TDM_RX_3:
+ case AFE_PORT_ID_QUINARY_TDM_RX_4:
+ case AFE_PORT_ID_QUINARY_TDM_RX_5:
+ case AFE_PORT_ID_QUINARY_TDM_RX_6:
+ case AFE_PORT_ID_QUINARY_TDM_RX_7:
case AFE_PORT_ID_USB_RX:
case AFE_PORT_ID_INT0_MI2S_RX:
case AFE_PORT_ID_INT1_MI2S_RX:
@@ -566,6 +575,7 @@
case AFE_PORT_ID_SECONDARY_PCM_TX:
case AFE_PORT_ID_TERTIARY_PCM_TX:
case AFE_PORT_ID_QUATERNARY_PCM_TX:
+ case AFE_PORT_ID_QUINARY_PCM_TX:
case AFE_PORT_ID_PRIMARY_TDM_TX:
case AFE_PORT_ID_PRIMARY_TDM_TX_1:
case AFE_PORT_ID_PRIMARY_TDM_TX_2:
@@ -598,6 +608,14 @@
case AFE_PORT_ID_QUATERNARY_TDM_TX_5:
case AFE_PORT_ID_QUATERNARY_TDM_TX_6:
case AFE_PORT_ID_QUATERNARY_TDM_TX_7:
+ case AFE_PORT_ID_QUINARY_TDM_TX:
+ case AFE_PORT_ID_QUINARY_TDM_TX_1:
+ case AFE_PORT_ID_QUINARY_TDM_TX_2:
+ case AFE_PORT_ID_QUINARY_TDM_TX_3:
+ case AFE_PORT_ID_QUINARY_TDM_TX_4:
+ case AFE_PORT_ID_QUINARY_TDM_TX_5:
+ case AFE_PORT_ID_QUINARY_TDM_TX_6:
+ case AFE_PORT_ID_QUINARY_TDM_TX_7:
case AFE_PORT_ID_USB_TX:
case AFE_PORT_ID_INT0_MI2S_TX:
case AFE_PORT_ID_INT1_MI2S_TX:
@@ -685,6 +703,8 @@
case AFE_PORT_ID_TERTIARY_PCM_TX:
case AFE_PORT_ID_QUATERNARY_PCM_RX:
case AFE_PORT_ID_QUATERNARY_PCM_TX:
+ case AFE_PORT_ID_QUINARY_PCM_RX:
+ case AFE_PORT_ID_QUINARY_PCM_TX:
default:
pr_debug("%s: default case 0x%x\n", __func__, port_id);
ret_size = SIZEOF_CFG_CMD(afe_param_id_pcm_cfg);
@@ -3071,6 +3091,8 @@
case AFE_PORT_ID_TERTIARY_PCM_TX:
case AFE_PORT_ID_QUATERNARY_PCM_RX:
case AFE_PORT_ID_QUATERNARY_PCM_TX:
+ case AFE_PORT_ID_QUINARY_PCM_RX:
+ case AFE_PORT_ID_QUINARY_PCM_TX:
cfg_type = AFE_PARAM_ID_PCM_CONFIG;
break;
case PRIMARY_I2S_RX:
@@ -3288,6 +3310,10 @@
return IDX_AFE_PORT_ID_QUATERNARY_PCM_RX;
case AFE_PORT_ID_QUATERNARY_PCM_TX:
return IDX_AFE_PORT_ID_QUATERNARY_PCM_TX;
+ case AFE_PORT_ID_QUINARY_PCM_RX:
+ return IDX_AFE_PORT_ID_QUINARY_PCM_RX;
+ case AFE_PORT_ID_QUINARY_PCM_TX:
+ return IDX_AFE_PORT_ID_QUINARY_PCM_TX;
case SECONDARY_I2S_RX: return IDX_SECONDARY_I2S_RX;
case SECONDARY_I2S_TX: return IDX_SECONDARY_I2S_TX;
case MI2S_RX: return IDX_MI2S_RX;
@@ -3481,6 +3507,38 @@
return IDX_AFE_PORT_ID_QUATERNARY_TDM_RX_7;
case AFE_PORT_ID_QUATERNARY_TDM_TX_7:
return IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_7;
+ case AFE_PORT_ID_QUINARY_TDM_RX:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_0;
+ case AFE_PORT_ID_QUINARY_TDM_TX:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_0;
+ case AFE_PORT_ID_QUINARY_TDM_RX_1:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_1;
+ case AFE_PORT_ID_QUINARY_TDM_TX_1:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_1;
+ case AFE_PORT_ID_QUINARY_TDM_RX_2:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_2;
+ case AFE_PORT_ID_QUINARY_TDM_TX_2:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_2;
+ case AFE_PORT_ID_QUINARY_TDM_RX_3:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_3;
+ case AFE_PORT_ID_QUINARY_TDM_TX_3:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_3;
+ case AFE_PORT_ID_QUINARY_TDM_RX_4:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_4;
+ case AFE_PORT_ID_QUINARY_TDM_TX_4:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_4;
+ case AFE_PORT_ID_QUINARY_TDM_RX_5:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_5;
+ case AFE_PORT_ID_QUINARY_TDM_TX_5:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_5;
+ case AFE_PORT_ID_QUINARY_TDM_RX_6:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_6;
+ case AFE_PORT_ID_QUINARY_TDM_TX_6:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_6;
+ case AFE_PORT_ID_QUINARY_TDM_RX_7:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_RX_7;
+ case AFE_PORT_ID_QUINARY_TDM_TX_7:
+ return IDX_AFE_PORT_ID_QUINARY_TDM_TX_7;
case AFE_PORT_ID_INT0_MI2S_RX:
return IDX_AFE_PORT_ID_INT0_MI2S_RX;
case AFE_PORT_ID_INT0_MI2S_TX:
@@ -3597,6 +3655,8 @@
case AFE_PORT_ID_TERTIARY_PCM_TX:
case AFE_PORT_ID_QUATERNARY_PCM_RX:
case AFE_PORT_ID_QUATERNARY_PCM_TX:
+ case AFE_PORT_ID_QUINARY_PCM_RX:
+ case AFE_PORT_ID_QUINARY_PCM_TX:
cfg_type = AFE_PARAM_ID_PCM_CONFIG;
break;
case SECONDARY_I2S_RX:
@@ -3980,6 +4040,8 @@
case AFE_GROUP_DEVICE_ID_TERTIARY_TDM_TX:
case AFE_GROUP_DEVICE_ID_QUATERNARY_TDM_RX:
case AFE_GROUP_DEVICE_ID_QUATERNARY_TDM_TX:
+ case AFE_GROUP_DEVICE_ID_QUINARY_TDM_RX:
+ case AFE_GROUP_DEVICE_ID_QUINARY_TDM_TX:
cfg_type = AFE_PARAM_ID_GROUP_DEVICE_TDM_CONFIG;
break;
default:
@@ -5262,6 +5324,8 @@
case AFE_PORT_ID_TERTIARY_PCM_TX:
case AFE_PORT_ID_QUATERNARY_PCM_RX:
case AFE_PORT_ID_QUATERNARY_PCM_TX:
+ case AFE_PORT_ID_QUINARY_PCM_RX:
+ case AFE_PORT_ID_QUINARY_PCM_TX:
case SECONDARY_I2S_RX:
case SECONDARY_I2S_TX:
case MI2S_RX:
@@ -5376,6 +5440,22 @@
case AFE_PORT_ID_QUATERNARY_TDM_TX_6:
case AFE_PORT_ID_QUATERNARY_TDM_RX_7:
case AFE_PORT_ID_QUATERNARY_TDM_TX_7:
+ case AFE_PORT_ID_QUINARY_TDM_RX:
+ case AFE_PORT_ID_QUINARY_TDM_TX:
+ case AFE_PORT_ID_QUINARY_TDM_RX_1:
+ case AFE_PORT_ID_QUINARY_TDM_TX_1:
+ case AFE_PORT_ID_QUINARY_TDM_RX_2:
+ case AFE_PORT_ID_QUINARY_TDM_TX_2:
+ case AFE_PORT_ID_QUINARY_TDM_RX_3:
+ case AFE_PORT_ID_QUINARY_TDM_TX_3:
+ case AFE_PORT_ID_QUINARY_TDM_RX_4:
+ case AFE_PORT_ID_QUINARY_TDM_TX_4:
+ case AFE_PORT_ID_QUINARY_TDM_RX_5:
+ case AFE_PORT_ID_QUINARY_TDM_TX_5:
+ case AFE_PORT_ID_QUINARY_TDM_RX_6:
+ case AFE_PORT_ID_QUINARY_TDM_TX_6:
+ case AFE_PORT_ID_QUINARY_TDM_RX_7:
+ case AFE_PORT_ID_QUINARY_TDM_TX_7:
case AFE_PORT_ID_INT0_MI2S_RX:
case AFE_PORT_ID_INT1_MI2S_RX:
case AFE_PORT_ID_INT2_MI2S_RX: