From 3ee2ab63a720f57027e3ad82744bf546a81ac005 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 6 Apr 2023 11:14:13 -0700 Subject: [PATCH] topology2: Rename passthrough-playback.conf Rename it to host-gateway-playback.conf to align with the documentation. Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/cavs-nocodec-bt.conf | 4 ++-- tools/topology/topology2/cavs-rt5682.conf | 2 +- tools/topology/topology2/cavs-sdw.conf | 2 +- ...-playback.conf => host-gateway-playback.conf} | 16 ++++++++-------- .../topology2/platform/intel/bt-generic.conf | 2 +- .../topology2/platform/intel/hdmi-generic.conf | 4 ++-- tools/topology/topology2/sof-hda-generic.conf | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) rename tools/topology/topology2/include/pipelines/cavs/{passthrough-playback.conf => host-gateway-playback.conf} (73%) diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index dd69abddb..978ca4056 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -11,7 +11,7 @@ - + @@ -155,7 +155,7 @@ Object.Pipeline { } ] - passthrough-playback [ + host-gateway-playback [ { index 1 Object.Widget.pipeline.1 { diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 90e8d95c7..fd9b4592b 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -11,7 +11,7 @@ - + diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 5127b2384..00fbf413c 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -15,7 +15,7 @@ - + diff --git a/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf similarity index 73% rename from tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf rename to tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf index c7682dba9..6e0312391 100644 --- a/tools/topology/topology2/include/pipelines/cavs/passthrough-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf @@ -1,12 +1,12 @@ # -# CAVS passthrough playback pipeline +# Host gateway playback pipeline # -# A simple passthrough pipeline. All attributes defined herein are namespaced -# by alsatplg to "Object.Pipeline.passthrough-playback.N.attribute_name" +# A simple host gateway pipeline for playback. All attributes defined herein are namespaced +# by alsatplg to "Object.Pipeline.host-gateway-playback.N.attribute_name" # -# Usage: passthrough-playback pipeline object can be instantiated as: +# Usage: host-gateway-playback pipeline object can be instantiated as: # -# Object.Pipeline.passthrough-playback."N" { +# Object.Pipeline.host-gateway-playback."N" { # period 1000 # time_domain "timer" # channels 2 @@ -20,7 +20,7 @@ -Class.Pipeline."passthrough-playback" { +Class.Pipeline."host-gateway-playback" { DefineAttribute."index" {} @@ -36,8 +36,8 @@ Class.Pipeline."passthrough-playback" { ] # - # passthrough-playback objects instantiated within the same alsaconf node must have - # unique pipeline_id attribute + # host-gateway-playback objects instantiated within the same alsaconf node must have + # unique instance attribute # unique "instance" } diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf index 9edf30d65..afc75621e 100644 --- a/tools/topology/topology2/platform/intel/bt-generic.conf +++ b/tools/topology/topology2/platform/intel/bt-generic.conf @@ -57,7 +57,7 @@ Object.Pipeline { } ] - passthrough-playback [ + host-gateway-playback [ { index $BT_PB_HOST_PIPELINE_ID Object.Widget.pipeline.1 { diff --git a/tools/topology/topology2/platform/intel/hdmi-generic.conf b/tools/topology/topology2/platform/intel/hdmi-generic.conf index 598cc5f0c..3cbf2d48b 100644 --- a/tools/topology/topology2/platform/intel/hdmi-generic.conf +++ b/tools/topology/topology2/platform/intel/hdmi-generic.conf @@ -32,7 +32,7 @@ Object.Dai.HDA [ ] Object.Pipeline { - passthrough-playback [ + host-gateway-playback [ { Object.Widget.copier.1 { stream_name $HDMI1_PCM_CAPS @@ -184,7 +184,7 @@ IncludeByKey.NUM_HDMIS { use_chain_dma $USE_CHAIN_DMA } ] - Object.Pipeline.passthrough-playback [ + Object.Pipeline.host-gateway-playback [ { Object.Widget.copier.1 { stream_name $HDMI4_PCM_CAPS diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index 9b6ba0fdb..919008beb 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -8,7 +8,7 @@ - +