From c5e7d3da71868d768daab892fe73220c3fe1c650 Mon Sep 17 00:00:00 2001 From: SaiSurya Ch Date: Tue, 5 Sep 2023 19:18:49 +0530 Subject: [PATCH] Make feedback channels Two Signed-off-by: SaiSurya Ch --- tools/topology/topology1/sof-smart-amplifier-amd-nocodec.m4 | 2 +- tools/topology/topology1/sof-smart-amplifier-amd.m4 | 2 +- tools/topology/topology1/sof/pipe-amp-ref-capture.m4 | 4 ++-- .../topology1/sof/pipe-smart-amplifier-playback-amd.m4 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/topology/topology1/sof-smart-amplifier-amd-nocodec.m4 b/tools/topology/topology1/sof-smart-amplifier-amd-nocodec.m4 index bce5cd200142..114a364324ff 100644 --- a/tools/topology/topology1/sof-smart-amplifier-amd-nocodec.m4 +++ b/tools/topology/topology1/sof-smart-amplifier-amd-nocodec.m4 @@ -40,7 +40,7 @@ define(`SMART_PB_PPL_ID', 1) define(`SMART_PB_CH_NUM', 2) define(`SMART_TX_CHANNELS', 2) define(`SMART_RX_CHANNELS', 2) -define(`SMART_FB_CHANNELS', 1) +define(`SMART_FB_CHANNELS', 2) # Ref capture related #7->2 define(`SMART_REF_PPL_ID', 2) diff --git a/tools/topology/topology1/sof-smart-amplifier-amd.m4 b/tools/topology/topology1/sof-smart-amplifier-amd.m4 index bf598a86470b..9ea2f8186a04 100644 --- a/tools/topology/topology1/sof-smart-amplifier-amd.m4 +++ b/tools/topology/topology1/sof-smart-amplifier-amd.m4 @@ -143,7 +143,7 @@ DAI_CONFIG(ACPHS, 1, SMART_BE_ID, acp-amp-codec, ACPHS_CONFIG(I2S, ACP_CLOCK(mclk, 49152000, codec_mclk_in), ACP_CLOCK(bclk, 3072000, codec_slave), ACP_CLOCK(fsync, 48000, codec_slave), - ACP_TDM(8, 32, 3, 3), + ACP_TDM(2, 32, 3, 3), ACPHS_CONFIG_DATA(ACPHS, 1, 48000, 2, 0))) DEBUG_END diff --git a/tools/topology/topology1/sof/pipe-amp-ref-capture.m4 b/tools/topology/topology1/sof/pipe-amp-ref-capture.m4 index f605496144bf..6b4ba77a6ffc 100644 --- a/tools/topology/topology1/sof/pipe-amp-ref-capture.m4 +++ b/tools/topology/topology1/sof/pipe-amp-ref-capture.m4 @@ -40,12 +40,12 @@ ifdef(`SMART_REF_CH_NUM',`',`fatal_error(note: Need to define Echo Ref channel n ifelse(SMART_FB_CHANNELS, `8', `define(`FB_CHMAP',`0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80')', -`define(`FB_CHMAP',`0x01,0x02,0x04,0x08,0x00,0x00,0x00,0x00')' +`define(`FB_CHMAP',`0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00')' ) ifelse(SMART_REF_CH_NUM, `4', `define(`REF_CHMAP',`0x01,0x02,0x04,0x08,0x00,0x00,0x00,0x00')', -`define(`REF_CHMAP',`0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x00')' +`define(`REF_CHMAP',`0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00')' ) diff --git a/tools/topology/topology1/sof/pipe-smart-amplifier-playback-amd.m4 b/tools/topology/topology1/sof/pipe-smart-amplifier-playback-amd.m4 index 22558333e7f3..92fec0fe69ee 100644 --- a/tools/topology/topology1/sof/pipe-smart-amplifier-playback-amd.m4 +++ b/tools/topology/topology1/sof/pipe-smart-amplifier-playback-amd.m4 @@ -38,7 +38,7 @@ ifdef(`SMART_UUID',`', `define(`SMART_UUID', smart_amp_comp_uuid)'); # initial config params for smart_amp, aligned with struct sof_smart_amp_config ifelse(SMART_FB_CHANNELS, `8', `define(`FB_CHMAP',`0xff,0xff,0x00,0x01,0xff,0xff,0xff,0xff')', -`define(`FB_CHMAP',`0x00,0x01,0x02,0x03,0xff,0xff,0xff,0xff')' +`define(`FB_CHMAP',`0x00,0x01,0xff,0xff,0xff,0xff,0xff,0xff')' ) CONTROLBYTES_PRIV(SMART_AMP_priv,