From 0a19b7fcfb38013f25cc02dc46bf588b65bb7a93 Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Mon, 14 Oct 2024 22:16:26 +0200 Subject: [PATCH] ucm2: wsa884x: fix typo in mixer names DTS fix for x1e80100-CRD will be submitted upstream separately Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/450 Signed-off-by: Jos Dehaes Signed-off-by: Jaroslav Kysela --- .../four-speakers/DefaultEnableSeq.conf | 24 +++++----- .../wsa884x/four-speakers/SpeakerSeq.conf | 48 +++++++++---------- ucm2/codecs/wsa884x/four-speakers/init.conf | 4 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ucm2/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf b/ucm2/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf index a8316bd..a6e3971 100644 --- a/ucm2/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf +++ b/ucm2/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf @@ -5,22 +5,22 @@ EnableSequence [ cset "name='WooferLeft PBR Switch' 1" cset "name='WooferLeft VISENSE Switch' 0" cset "name='WooferLeft WSA MODE' 0" - cset "name='TwitterLeft COMP Switch' 1" - cset "name='TwitterLeft BOOST Switch' 1" - cset "name='TwitterLeft DAC Switch' 1" - cset "name='TwitterLeft PBR Switch' 1" - cset "name='TwitterLeft VISENSE Switch' 0" - cset "name='TwitterLeft WSA MODE' 0" + cset "name='TweeterLeft COMP Switch' 1" + cset "name='TweeterLeft BOOST Switch' 1" + cset "name='TweeterLeft DAC Switch' 1" + cset "name='TweeterLeft PBR Switch' 1" + cset "name='TweeterLeft VISENSE Switch' 0" + cset "name='TweeterLeft WSA MODE' 0" cset "name='WooferRight COMP Switch' 1" cset "name='WooferRight BOOST Switch' 1" cset "name='WooferRight DAC Switch' 1" cset "name='WooferRight PBR Switch' 1" cset "name='WooferRight VISENSE Switch' 0" cset "name='WooferRight WSA MODE' 0" - cset "name='TwitterRight COMP Switch' 1" - cset "name='TwitterRight BOOST Switch' 1" - cset "name='TwitterRight DAC Switch' 1" - cset "name='TwitterRight PBR Switch' 1" - cset "name='TwitterRight VISENSE Switch' 0" - cset "name='TwitterRight WSA MODE' 0" + cset "name='TweeterRight COMP Switch' 1" + cset "name='TweeterRight BOOST Switch' 1" + cset "name='TweeterRight DAC Switch' 1" + cset "name='TweeterRight PBR Switch' 1" + cset "name='TweeterRight VISENSE Switch' 0" + cset "name='TweeterRight WSA MODE' 0" ] diff --git a/ucm2/codecs/wsa884x/four-speakers/SpeakerSeq.conf b/ucm2/codecs/wsa884x/four-speakers/SpeakerSeq.conf index 7a37062..93176a0 100644 --- a/ucm2/codecs/wsa884x/four-speakers/SpeakerSeq.conf +++ b/ucm2/codecs/wsa884x/four-speakers/SpeakerSeq.conf @@ -6,13 +6,13 @@ EnableSequence [ cset "name='WooferLeft VISENSE Switch' 0" cset "name='WooferLeft WSA MODE' 0" cset "name='WooferLeft PA Volume' 12" - cset "name='TwitterLeft COMP Switch' 1" - cset "name='TwitterLeft BOOST Switch' 1" - cset "name='TwitterLeft DAC Switch' 1" - cset "name='TwitterLeft PBR Switch' 1" - cset "name='TwitterLeft VISENSE Switch' 0" - cset "name='TwitterLeft WSA MODE' 0" - cset "name='TwitterLeft PA Volume' 12" + cset "name='TweeterLeft COMP Switch' 1" + cset "name='TweeterLeft BOOST Switch' 1" + cset "name='TweeterLeft DAC Switch' 1" + cset "name='TweeterLeft PBR Switch' 1" + cset "name='TweeterLeft VISENSE Switch' 0" + cset "name='TweeterLeft WSA MODE' 0" + cset "name='TweeterLeft PA Volume' 12" cset "name='WooferRight COMP Switch' 1" cset "name='WooferRight BOOST Switch' 1" cset "name='WooferRight DAC Switch' 1" @@ -20,13 +20,13 @@ EnableSequence [ cset "name='WooferRight VISENSE Switch' 0" cset "name='WooferRight WSA MODE' 0" cset "name='WooferRight PA Volume' 12" - cset "name='TwitterRight COMP Switch' 1" - cset "name='TwitterRight BOOST Switch' 1" - cset "name='TwitterRight DAC Switch' 1" - cset "name='TwitterRight PBR Switch' 1" - cset "name='TwitterRight VISENSE Switch' 0" - cset "name='TwitterRight WSA MODE' 0" - cset "name='TwitterRight PA Volume' 12" + cset "name='TweeterRight COMP Switch' 1" + cset "name='TweeterRight BOOST Switch' 1" + cset "name='TweeterRight DAC Switch' 1" + cset "name='TweeterRight PBR Switch' 1" + cset "name='TweeterRight VISENSE Switch' 0" + cset "name='TweeterRight WSA MODE' 0" + cset "name='TweeterRight PA Volume' 12" ] DisableSequence [ @@ -35,19 +35,19 @@ DisableSequence [ cset "name='WooferLeft DAC Switch' 0" cset "name='WooferLeft PBR Switch' 0" cset "name='WooferLeft VISENSE Switch' 0" - cset "name='TwitterLeft COMP Switch' 0" - cset "name='TwitterLeft BOOST Switch' 0" - cset "name='TwitterLeft DAC Switch' 0" - cset "name='TwitterLeft PBR Switch' 0" - cset "name='TwitterLeft VISENSE Switch' 0" + cset "name='TweeterLeft COMP Switch' 0" + cset "name='TweeterLeft BOOST Switch' 0" + cset "name='TweeterLeft DAC Switch' 0" + cset "name='TweeterLeft PBR Switch' 0" + cset "name='TweeterLeft VISENSE Switch' 0" cset "name='WooferRight COMP Switch' 0" cset "name='WooferRight BOOST Switch' 0" cset "name='WooferRight DAC Switch' 0" cset "name='WooferRight PBR Switch' 0" cset "name='WooferRight VISENSE Switch' 0" - cset "name='TwitterRight COMP Switch' 0" - cset "name='TwitterRight BOOST Switch' 0" - cset "name='TwitterRight DAC Switch' 0" - cset "name='TwitterRight PBR Switch' 0" - cset "name='TwitterRight VISENSE Switch' 0" + cset "name='TweeterRight COMP Switch' 0" + cset "name='TweeterRight BOOST Switch' 0" + cset "name='TweeterRight DAC Switch' 0" + cset "name='TweeterRight PBR Switch' 0" + cset "name='TweeterRight VISENSE Switch' 0" ] diff --git a/ucm2/codecs/wsa884x/four-speakers/init.conf b/ucm2/codecs/wsa884x/four-speakers/init.conf index 22349ea..79ec3fa 100644 --- a/ucm2/codecs/wsa884x/four-speakers/init.conf +++ b/ucm2/codecs/wsa884x/four-speakers/init.conf @@ -4,9 +4,9 @@ LibraryConfig.remap.Config { # Merge four mono controls into one "name='Speakers Volume'" { "name='WooferLeft PA Volume'".vindex.0 0 - "name='TwitterLeft PA Volume'".vindex.1 0 + "name='TweeterLeft PA Volume'".vindex.1 0 "name='WooferRight PA Volume'".vindex.2 0 - "name='TwitterRight PA Volume'".vindex.3 0 + "name='TweeterRight PA Volume'".vindex.3 0 } } } -- 2.47.1