From de840ce03e64a9310c9ca65c10a7915abe30fd83 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Fri, 13 Oct 2023 08:27:43 -0700 Subject: [PATCH] topology2: sdw-amp/dmic-generic: Remove incorrect audio format Setting the in bit depth for the second audio format in the host-gateway-capture object results in resetting the channel count to 2. The in_bit_depth is set to 32-bit by default for all audio formats in host-gateway-capture class already. Fixes: 7a11e27bf2a1 ('topology2: host-gateway-capture: Replace audio_format objects') Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/platform/intel/sdw-amp-generic.conf | 5 ----- .../topology/topology2/platform/intel/sdw-dmic-generic.conf | 5 ----- 2 files changed, 10 deletions(-) diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf index 57f3a089101d..c19423d62f2f 100644 --- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf @@ -350,11 +350,6 @@ IncludeByKey.SDW_AMP_FEEDBACK { Object.Widget.host-copier.1 { stream_name "amp feedback" pcm_id 3 - Object.Base.audio_format.1 { - # 32 -> 16 bits conversion is done here, - # so in_bit_depth is 32 (and out_bit_depth is 16). - in_bit_depth 32 - } } } ] diff --git a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf index 2d7e7e54f27f..e8b0ca2dbb31 100644 --- a/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-dmic-generic.conf @@ -30,11 +30,6 @@ Object.Pipeline { Object.Widget.host-copier.1 { stream_name "sdw dmic" pcm_id 4 - Object.Base.audio_format.1 { - # 32 -> 16 bits conversion is done here, - # so in_bit_depth is 32 (and out_bit_depth is 16). - in_bit_depth 32 - } } } ]