From: Jaroslav Kysela Date: Wed, 20 Nov 2019 17:59:00 +0000 (+0100) Subject: bytcr-rt5651: adapt to ucm2 X-Git-Tag: v1.2.1.2~25 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=faf69ec816a412da2e62d1bda00bb14ffb321495;p=alsa-ucm-conf.git bytcr-rt5651: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf deleted file mode 100644 index b93e0be..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf deleted file mode 100644 index a2f584e..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-mono-spk-in1-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf deleted file mode 100644 index ef04862..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf deleted file mode 100644 index 916fbc1..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf deleted file mode 100644 index c324c14..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf deleted file mode 100644 index 4ad36ec..0000000 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-mono-spk-in2-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf deleted file mode 100644 index abf5fc7..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf b/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf deleted file mode 100644 index de8d954..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf deleted file mode 100644 index aa1a1cd..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf deleted file mode 100644 index 40d871b..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf deleted file mode 100644 index 343aed2..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf deleted file mode 100644 index 56bf3f0..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf deleted file mode 100644 index 84e86e4..0000000 --- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -SectionUseCase."HiFi" { - File "../bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf deleted file mode 100644 index 8fcc5a8..0000000 --- a/ucm/bytcr-rt5651/HiFi.conf +++ /dev/null @@ -1,31 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - cdev "hw:bytcrrt5651" - - - ] - - DisableSequence [ - cdev "hw:bytcrrt5651" - - ] - - Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" - } -} - - - - - - - - - - - diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf new file mode 100644 index 0000000..235838e --- /dev/null +++ b/ucm2/bytcr-rt5651/HiFi-Components.conf @@ -0,0 +1,81 @@ +If.spk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:2" + } + True { + + } +} + +If.mono { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:1" + } + True { + + } +} + +If.headphones { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-hp:lrswap" + } + True { + + } + False { + + } +} + +If.dmic1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic1" + } + True { + + } +} + +If.in1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in1" + } + True { + + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in2" + } + True { + + } +} + +If.in12 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in12" + } + True { + + } +} + + diff --git a/ucm2/bytcr-rt5651/HiFi-LongName.conf b/ucm2/bytcr-rt5651/HiFi-LongName.conf new file mode 100644 index 0000000..58eb722 --- /dev/null +++ b/ucm2/bytcr-rt5651/HiFi-LongName.conf @@ -0,0 +1,81 @@ +If.spk { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-stereo-spk" + } + True { + + } +} + +If.mono { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mono-spk" + } + True { + + } +} + +If.headphones { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mic-hp-swapped" + } + True { + + } + False { + + } +} + +If.dmic1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-dmic1-mic" + } + True { + + } +} + +If.in1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in1-mic" + } + True { + + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in2-mic" + } + True { + + } +} + +If.in12 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in12-mic" + } + True { + + } +} + + diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf b/ucm2/bytcr-rt5651/HiFi.conf similarity index 52% rename from ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf rename to ucm2/bytcr-rt5651/HiFi.conf index 6f6d74c..1f031f2 100644 --- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf +++ b/ucm2/bytcr-rt5651/HiFi.conf @@ -3,24 +3,30 @@ SectionVerb { EnableSequence [ - cdev "hw:bytcrrt5651" ] DisableSequence [ - cdev "hw:bytcrrt5651" ] Value { - PlaybackPCM "hw:bytcrrt5651" - CapturePCM "hw:bytcrrt5651" + PlaybackPCM "hw:${CardId}" + CapturePCM "hw:${CardId}" } } - - - - - +If.0 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:" + } + True { + + } + False { + + } +} diff --git a/ucm/bytcr-rt5651/bytcr-rt5651.conf b/ucm2/bytcr-rt5651/bytcr-rt5651.conf similarity index 78% rename from ucm/bytcr-rt5651/bytcr-rt5651.conf rename to ucm2/bytcr-rt5651/bytcr-rt5651.conf index 45889d8..64888ba 100644 --- a/ucm/bytcr-rt5651/bytcr-rt5651.conf +++ b/ucm2/bytcr-rt5651/bytcr-rt5651.conf @@ -1,10 +1,8 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 +Syntax 2 + SectionUseCase."HiFi" { File "HiFi.conf" Comment "Play HiFi quality Music" } - -SectionDefaults [ - cdev "hw:bytcrrt5651" -] diff --git a/ucm/codecs/rt5651/DigitalMic.conf b/ucm2/codecs/rt5651/DigitalMic.conf similarity index 91% rename from ucm/codecs/rt5651/DigitalMic.conf rename to ucm2/codecs/rt5651/DigitalMic.conf index 63ffa9d..7a0c4d4 100644 --- a/ucm/codecs/rt5651/DigitalMic.conf +++ b/ucm2/codecs/rt5651/DigitalMic.conf @@ -10,14 +10,12 @@ SectionDevice."DigitalMic" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC2 Switch' on" cset "name='Stereo1 ADC MIXR ADC2 Switch' on" cset "name='Internal Mic Switch' on" ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC2 Switch' off" cset "name='Stereo1 ADC MIXR ADC2 Switch' off" cset "name='Internal Mic Switch' off" diff --git a/ucm/codecs/rt5651/EnableSeq.conf b/ucm2/codecs/rt5651/EnableSeq.conf similarity index 100% rename from ucm/codecs/rt5651/EnableSeq.conf rename to ucm2/codecs/rt5651/EnableSeq.conf diff --git a/ucm/codecs/rt5651/HeadPhones-swapped.conf b/ucm2/codecs/rt5651/HeadPhones-swapped.conf similarity index 95% rename from ucm/codecs/rt5651/HeadPhones-swapped.conf rename to ucm2/codecs/rt5651/HeadPhones-swapped.conf index e79b40a..f5260a3 100644 --- a/ucm/codecs/rt5651/HeadPhones-swapped.conf +++ b/ucm2/codecs/rt5651/HeadPhones-swapped.conf @@ -7,8 +7,6 @@ SectionDevice."Headphones" { ] EnableSequence [ - cdev "hw:bytcrrt5651" - # Swap left and right cset "name='Stereo DAC MIXL DAC R1 Switch' on" cset "name='Stereo DAC MIXL DAC L1 Switch' off" @@ -25,7 +23,6 @@ SectionDevice."Headphones" { ] DisableSequence [ - cdev "hw:bytcrrt5651" # Disabling the HP switches is done by the Speaker EnableSeq # Unswap left and right diff --git a/ucm/codecs/rt5651/HeadPhones.conf b/ucm2/codecs/rt5651/HeadPhones.conf similarity index 93% rename from ucm/codecs/rt5651/HeadPhones.conf rename to ucm2/codecs/rt5651/HeadPhones.conf index eaf5fdf..0a87b32 100644 --- a/ucm/codecs/rt5651/HeadPhones.conf +++ b/ucm2/codecs/rt5651/HeadPhones.conf @@ -7,7 +7,6 @@ SectionDevice."Headphones" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Headphone Switch' on" cset "name='HPO L Playback Switch' on" cset "name='HPO R Playback Switch' on" @@ -18,7 +17,6 @@ SectionDevice."Headphones" { ] DisableSequence [ - cdev "hw:bytcrrt5651" # This is done by the Speaker EnableSequence, so that the # Platform Clock and BIAS do not temporarily get turned off # as that breaks audio-streams which are playing when diff --git a/ucm/codecs/rt5651/IN1-InternalMic.conf b/ucm2/codecs/rt5651/IN1-InternalMic.conf similarity index 93% rename from ucm/codecs/rt5651/IN1-InternalMic.conf rename to ucm2/codecs/rt5651/IN1-InternalMic.conf index 12ab5cb..01b786e 100644 --- a/ucm/codecs/rt5651/IN1-InternalMic.conf +++ b/ucm2/codecs/rt5651/IN1-InternalMic.conf @@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN1" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Internal Mic Switch' on" cset "name='RECMIXL BST1 Switch' on" cset "name='RECMIXR BST1 Switch' on" @@ -19,7 +18,6 @@ SectionDevice."InternalMic-IN1" { ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC1 Switch' off" cset "name='Stereo1 ADC MIXR ADC1 Switch' off" cset "name='Internal Mic Switch' off" diff --git a/ucm/codecs/rt5651/IN12-InternalMic.conf b/ucm2/codecs/rt5651/IN12-InternalMic.conf similarity index 94% rename from ucm/codecs/rt5651/IN12-InternalMic.conf rename to ucm2/codecs/rt5651/IN12-InternalMic.conf index c4290b7..44cc53a 100644 --- a/ucm/codecs/rt5651/IN12-InternalMic.conf +++ b/ucm2/codecs/rt5651/IN12-InternalMic.conf @@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN12" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Internal Mic Switch' on" cset "name='RECMIXL BST1 Switch' on" cset "name='RECMIXR BST1 Switch' on" @@ -21,7 +20,6 @@ SectionDevice."InternalMic-IN12" { ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC1 Switch' off" cset "name='Stereo1 ADC MIXR ADC1 Switch' off" cset "name='Internal Mic Switch' off" diff --git a/ucm/codecs/rt5651/IN2-HeadsetMic.conf b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf similarity index 93% rename from ucm/codecs/rt5651/IN2-HeadsetMic.conf rename to ucm2/codecs/rt5651/IN2-HeadsetMic.conf index 8759c27..177f70b 100644 --- a/ucm/codecs/rt5651/IN2-HeadsetMic.conf +++ b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf @@ -10,7 +10,6 @@ SectionDevice."HeadsetMic-IN2" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Headset Mic Switch' on" cset "name='RECMIXL BST2 Switch' on" cset "name='RECMIXR BST2 Switch' on" @@ -19,7 +18,6 @@ SectionDevice."HeadsetMic-IN2" { ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC1 Switch' off" cset "name='Stereo1 ADC MIXR ADC1 Switch' off" cset "name='Headset Mic Switch' off" diff --git a/ucm/codecs/rt5651/IN2-InternalMic.conf b/ucm2/codecs/rt5651/IN2-InternalMic.conf similarity index 93% rename from ucm/codecs/rt5651/IN2-InternalMic.conf rename to ucm2/codecs/rt5651/IN2-InternalMic.conf index c9c11c2..611ca6c 100644 --- a/ucm/codecs/rt5651/IN2-InternalMic.conf +++ b/ucm2/codecs/rt5651/IN2-InternalMic.conf @@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN2" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Internal Mic Switch' on" cset "name='RECMIXL BST2 Switch' on" cset "name='RECMIXR BST2 Switch' on" @@ -19,7 +18,6 @@ SectionDevice."InternalMic-IN2" { ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC1 Switch' off" cset "name='Stereo1 ADC MIXR ADC1 Switch' off" cset "name='Internal Mic Switch' off" diff --git a/ucm/codecs/rt5651/IN3-HeadsetMic.conf b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf similarity index 93% rename from ucm/codecs/rt5651/IN3-HeadsetMic.conf rename to ucm2/codecs/rt5651/IN3-HeadsetMic.conf index 66af6b9..3231e78 100644 --- a/ucm/codecs/rt5651/IN3-HeadsetMic.conf +++ b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf @@ -10,7 +10,6 @@ SectionDevice."HeadsetMic-IN3" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Headset Mic Switch' on" cset "name='RECMIXL BST3 Switch' on" cset "name='RECMIXR BST3 Switch' on" @@ -19,7 +18,6 @@ SectionDevice."HeadsetMic-IN3" { ] DisableSequence [ - cdev "hw:bytcrrt5651" cset "name='Stereo1 ADC MIXL ADC1 Switch' off" cset "name='Stereo1 ADC MIXR ADC1 Switch' off" cset "name='Headset Mic Switch' off" diff --git a/ucm/codecs/rt5651/MonoSpeaker.conf b/ucm2/codecs/rt5651/MonoSpeaker.conf similarity index 96% rename from ucm/codecs/rt5651/MonoSpeaker.conf rename to ucm2/codecs/rt5651/MonoSpeaker.conf index f4181d1..c2276c6 100644 --- a/ucm/codecs/rt5651/MonoSpeaker.conf +++ b/ucm2/codecs/rt5651/MonoSpeaker.conf @@ -7,8 +7,6 @@ SectionDevice."MonoSpeaker" { ] EnableSequence [ - cdev "hw:bytcrrt5651" - # On most (all?) devices with a single / mono speaker an # amplifier with a differential input connected between LOUT # right and left is used. We deal with this by silencing the @@ -36,7 +34,6 @@ SectionDevice."MonoSpeaker" { ] DisableSequence [ - cdev "hw:bytcrrt5651" # Disabling the switches is done by the Speaker EnableSeq # Undo mono mapping diff --git a/ucm/codecs/rt5651/Speaker.conf b/ucm2/codecs/rt5651/Speaker.conf similarity index 93% rename from ucm/codecs/rt5651/Speaker.conf rename to ucm2/codecs/rt5651/Speaker.conf index c109152..463d13b 100644 --- a/ucm/codecs/rt5651/Speaker.conf +++ b/ucm2/codecs/rt5651/Speaker.conf @@ -7,7 +7,6 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:bytcrrt5651" cset "name='Speaker Switch' on" cset "name='LOUT L Playback Switch' on" cset "name='LOUT R Playback Switch' on" @@ -18,7 +17,6 @@ SectionDevice."Speaker" { ] DisableSequence [ - cdev "hw:bytcrrt5651" # This is done by the Headphones EnableSequence, so that the # Platform Clock and BIAS do not temporarily get turned off # as that breaks audio-streams which are playing when