audioreach: add mfc and fix connections

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

audioreach/subgraph-device-codec-dma-capture.m4

@@ -54,8 +54,8 @@ AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRE
 
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID)
 
-AR_MODULE_CODEC_DMA_TX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 0, 1, 0, 2, 0, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME') 
-AR_MODULE_LOG(   MOD_INDEX, SG_INDEX,       CONTAINER_INDEX, LOG_MODULE_IID,     1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0)
+AR_MODULE_CODEC_DMA_TX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 0, 1, 0, 2, 1, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', LOG_MODULE_IID) 
+AR_MODULE_LOG(   MOD_INDEX, SG_INDEX,       CONTAINER_INDEX, LOG_MODULE_IID,     1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0, NONE_IID)
 dnl kcontrol switch
 DEVICE_CAPTURE_MIXER(SG_INDEX, `DEVICE_NAME')
 DEVICE_CAPTURE_ROUTE(MOD_INDEX, `DEVICE_NAME') 

audioreach/subgraph-device-codec-dma-playback.m4

@@ -56,7 +56,7 @@ define(`DEVICE_PLAYBACK_ROUTE',
 
 AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRECTION, CONT_SENARIO_ID)
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID)
-AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 		LOG_MODULE_IID,     1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0)
-AR_MODULE_CODEC_DMA_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME') 
+AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 		LOG_MODULE_IID,     1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0, CDC_DMA_MODULE_IID)
+AR_MODULE_CODEC_DMA_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', NONE_IID) 
 DEVICE_PLAYBACK_ROUTE(MOD_INDEX, `DEVICE_NAME') 
 

audioreach/subgraph-device-i2s-playback.m4

@@ -57,7 +57,7 @@ define(`DEVICE_PLAYBACK_ROUTE',
 AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRECTION, CONT_SENARIO_ID)
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID)
 
-AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0)
-AR_MODULE_I2S_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 	I2S_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, DEVICE_SD_LINE_IDX, `DEVICE_NAME') 
+AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0,I2S_MODULE_IID )
+AR_MODULE_I2S_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, 	I2S_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, DEVICE_SD_LINE_IDX, `DEVICE_NAME', NONE_IID) 
 DEVICE_PLAYBACK_ROUTE(MOD_INDEX, `DEVICE_NAME', `MIXER_PREFIX') 
 

audioreach/subgraph-stream-capture.m4

@@ -4,6 +4,7 @@ include(`audioreach/subgraph.m4') dnl
 include(`audioreach/container.m4') dnl
 include(`audioreach/module_rdsh.m4') dnl
 include(`audioreach/module_pcmenc.m4') dnl
+include(`audioreach/module_mfc.m4') dnl
 include(`audioreach/module_pcmcnv.m4') dnl
 include(`audioreach/module_log.m4') dnl
 include(`util/mixer.m4') dnl
@@ -33,9 +34,10 @@ define(`PCM_DOMAIN_ID', APM_PROC_DOMAIN_ID_ADSP) dnl'
 define(`CONT_STACK_SIZE', 8192) dnl'
 
 define(`LOG_MODULE_IID', MOD_IID_START) dnl
-define(`PCMCNV_MODULE_IID', eval(MOD_IID_START + 1)) dnl
-define(`PCMENC_MODULE_IID', eval(MOD_IID_START + 2)) dnl
-define(`RDSH_MODULE_IID', eval(MOD_IID_START + 3)) dnl
+define(`MFC_MODULE_IID', eval(MOD_IID_START + 1)) dnl
+define(`PCMCNV_MODULE_IID', eval(MOD_IID_START + 2)) dnl
+define(`PCMENC_MODULE_IID', eval(MOD_IID_START + 3)) dnl
+define(`RDSH_MODULE_IID', eval(MOD_IID_START + 4)) dnl
 define(`SG_INDEX', 1) dnl
 define(`CONTAINER_INDEX', 1) dnl
 define(`MOD_INDEX', 1) dnl
@@ -47,7 +49,8 @@ define(`STREAM_CAPTURE_ROUTE',
 `        index STR($1)'
 `        lines ['
 `                "NAME_PREFIX.logger$1, , MultiMedia$2 Mixer"'
-`                "NAME_PREFIX.pcm_converter$1, , NAME_PREFIX.logger$1"'
+`                "NAME_PREFIX.mfc$1, , NAME_PREFIX.logger$1"'
+`                "NAME_PREFIX.pcm_converter$1, , NAME_PREFIX.mfc$1"'
 `                "NAME_PREFIX.pcm_encoder$1, , NAME_PREFIX.pcm_converter$1"'
 `                "NAME_PREFIX.rdsh_ep$1, , NAME_PREFIX.pcm_encoder$1"'
 `        ]'
@@ -60,9 +63,10 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, PCM_DOMAIN_ID)
 
 dnl AR_MODULE_LOG(index, sgidx, container-idx, iid,               maxip-ports, max-op-ports, in-ports, outports, src-mod, src-port, dst-mod, dst-port,
-AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
-AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
-AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
-AR_MODULE_RDSH(MOD_INDEX,   SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID,   1, 0, 2, 0, 1, 0, PCM_DAI_ID)
+AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0,MFC_MODULE_IID)
+AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCMCNV_MODULE_IID)
+AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, PCMENC_MODULE_IID)
+AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, RDSH_MODULE_IID)
+AR_MODULE_RDSH(MOD_INDEX,   SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID,   1, 0, 2, 0, 1, 0, PCM_DAI_ID, NONE_IID)
 
 STREAM_CAPTURE_ROUTE(MOD_INDEX, PCM_DAI_ID) 

audioreach/subgraph-stream-playback.m4

@@ -59,9 +59,9 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO
 
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
-AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID)
-AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
-AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
-AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
+AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID,PCMDEC_MODULE_IID)
+AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, PCMCNV_MODULE_IID)
+AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED, LOG_MODULE_IID)
+AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0, NONE_IID)
 STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX)
 STREAM_PLAYBACK_ROUTE(MOD_INDEX) 

audioreach/subgraph-stream-vol-playback.m4

@@ -4,6 +4,7 @@ include(`audioreach/subgraph.m4') dnl
 include(`audioreach/container.m4') dnl
 include(`audioreach/module_wrsh.m4') dnl
 include(`audioreach/module_pcmdec.m4') dnl
+include(`audioreach/module_mfc.m4') dnl
 include(`audioreach/module_pcmcnv.m4') dnl
 include(`audioreach/module_vol_ctrl.m4') dnl
 include(`audioreach/module_log.m4') dnl
@@ -36,7 +37,8 @@ define(`WRSH_MODULE_IID', MOD_IID_START) dnl
 define(`PCMDEC_MODULE_IID', eval(MOD_IID_START + 1)) dnl
 define(`PCMCNV_MODULE_IID', eval(MOD_IID_START + 2)) dnl
 define(`VOLCTRL_MODULE_IID', eval(MOD_IID_START + 3)) dnl
-define(`LOG_MODULE_IID', eval(MOD_IID_START + 4)) dnl
+define(`MFC_MODULE_IID', eval(MOD_IID_START + 4)) dnl
+define(`LOG_MODULE_IID', eval(MOD_IID_START + 5)) dnl
 define(`SG_INDEX', 1) dnl
 define(`CONTAINER_INDEX', 1) dnl
 define(`MOD_INDEX', 1) dnl
@@ -51,7 +53,8 @@ define(`STREAM_PLAYBACK_ROUTE',
 `                "NAME_PREFIX.pcm_decoder$2, , NAME_PREFIX.wrsh_ep$2"'
 `                "NAME_PREFIX.pcm_converter$2, , NAME_PREFIX.pcm_decoder$2"'
 `                "NAME_PREFIX.vol_ctrl$1, , NAME_PREFIX.pcm_converter$2"'
-`                "NAME_PREFIX.logger$2, , NAME_PREFIX.vol_ctrl$1"'
+`                "NAME_PREFIX.mfc$2, , NAME_PREFIX.vol_ctrl$1"'
+`                "NAME_PREFIX.logger$2, , NAME_PREFIX.mfc$2"'
 `        ]'
 `}')
 
@@ -62,10 +65,11 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO
 
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
-AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID)
-AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
-AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
-AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2)
-AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
+AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 1, 2, PCM_DAI_ID, PCMDEC_MODULE_IID)
+AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID)
+AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED,VOLCTRL_MODULE_IID)
+AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2,MFC_MODULE_IID)
+AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	MFC_MODULE_IID, 1, 1, 2, 1, 1, 2, LOG_MODULE_IID)
+AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0, NONE_IID)
 STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX)
 STREAM_PLAYBACK_ROUTE(PCM_DAI_ID, MOD_INDEX)