-----Original Message----- From: sound-open-firmware-bounces@alsa-project.org [mailto:sound-open- firmware-bounces@alsa-project.org] On Behalf Of Xiuli Pan Sent: Tuesday, February 27, 2018 10:38 PM To: sound-open-firmware@alsa-project.org Cc: Pan Xiuli xiuli.pan@linux.intel.com; Pan, Xiuli xiuli.pan@intel.com Subject: [Sound-open-firmware] [PATCH] topology: Remove unsupport multiple kcontrol for volume playback
From: Pan Xiuli xiuli.pan@linux.intel.com
Now we did not support multiple kcontrol, remove the two kcontrol in volume playback template.
Is this actually partial reverting of Ranjani's commit 09325e91fc43f39c99abb03b708e13637bfa6fc4 ?
Thanks, ~Keyon
Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com
topology/sof/pipe-volume-playback.m4 | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume- playback.m4 index 8aa02fb..9ccc5da 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -38,32 +38,6 @@ SectionControlMixer.STR(Master Playback Volume) { tlv "vtlv_m90s3" }
-SectionControlMixer.STR(Master Playback Volume Switch) {
- # control belongs to this index group
- index STR(PIPELINE_ID)
- # Channel register and shift for Front Left/Right
- channel."FL" {
reg "1"shift "0"- }
- channel."FR" {
reg "1"shift "1"- }
- # control uses bespoke driver get/put/info ID 0
- ops."ctl" {
info "volsw"get "256"put "256"- }
- # Volume mute on/off
- max "1"
- invert "false"
-} # # Components and Buffers # @@ -73,7 +47,7 @@ SectionControlMixer.STR(Master Playback Volume Switch) { W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
# "Volume" has 2 source and 2 sink periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume Switch", "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume"))
# Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.7.4
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware