Remove ucm files for L5 and PPP, because these are now already upstream master
authorDaniel Abrecht <public@danielabrecht.ch>
Fri, 12 Aug 2022 21:16:06 +0000 (21:16 +0000)
committerDaniel Abrecht <public@danielabrecht.ch>
Fri, 12 Aug 2022 21:16:06 +0000 (21:16 +0000)
config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/HiFi.conf [deleted file]
config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/Librem_5.conf [deleted file]
config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/HiFi.conf [deleted file]
config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf [deleted file]
config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/VoiceCall.conf [deleted file]
config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf [deleted symlink]

diff --git a/config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/HiFi.conf b/config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/HiFi.conf
deleted file mode 100644 (file)
index 4216aff..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-SectionVerb {
-       EnableSequence [
-               cset "name='Digital Playback Volume' 100,100"
-               cset "name='MIXINL IN2L Switch' off"
-               cset "name='MIXINL IN3L Switch' off"
-               cset "name='MIXINR IN2R Switch' off"
-               cset "name='MIXINR IN3R Switch' off"
-               cset "name='INPGAR IN1R Switch' off"
-               cset "name='INPGAR IN2R Switch' off"
-               cset "name='INPGAR IN3R Switch' on"
-               cset "name='INPGAR IN4R Switch' off"
-               cset "name='INPGAL IN1L Switch' off"
-               cset "name='INPGAL IN2L Switch' off"
-               cset "name='INPGAL IN3L Switch' off"
-               cset "name='INPGAL IN4L Switch' off"
-               cset "name='Input Mixer Switch' off,on"
-               cset "name='SPKOUTL PGA' Mixer"
-               cset "name='SPKOUTR PGA' Mixer"
-       ]
-
-       DisableSequence [
-               cset "name='Digital Playback Volume' 0,0"
-       ]
-
-       Value {
-       }
-}
-
-SectionDevice."Handset" {
-       Comment "Handset"
-
-       ConflictingDevice [
-               "Headphones"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='Speaker Switch' off,on"
-               cset "name='DAC L/R Swap Switch' on"
-               cset "name='DAC Monomix Switch' on"
-               cset "name='SPKOUTR PGA' DAC"
-               cset "name='Speaker Volume' 121,121"
-               cset "name='Speaker Boost Volume' 2"
-       ]
-
-       DisableSequence [
-               cset "name='Speaker Switch' off,off"
-               cset "name='DAC L/R Swap Switch' off"
-               cset "name='DAC Monomix Switch' off"
-               cset "name='SPKOUTR PGA' Mixer"
-       ]
-
-       Value {
-               PlaybackChannels "2"
-               PlaybackPriority "100"
-               PlaybackVolume "name='Speaker Volume'"
-               PlaybackSwitch "name='Speaker Switch'"
-               PlaybackPCM "hw:${CardId},0"
-       }
-}
-
-SectionDevice."Speaker" {
-       Comment "Speaker"
-
-       ConflictingDevice [
-               "Handset"
-               "Headphones"
-       ]
-
-       EnableSequence [
-               cset "name='Speaker Switch' on,off"
-               cset "name='DAC Monomix Switch' on"
-               cset "name='SPKOUTL PGA' DAC"
-               cset "name='Speaker Volume' 121,121"
-               cset "name='Speaker Boost Volume' 6"
-       ]
-
-       DisableSequence [
-               cset "name='Speaker Switch' off,off"
-               cset "name='DAC Monomix Switch' off"
-               cset "name='SPKOUTL PGA' Mixer"
-       ]
-
-       Value {
-               PlaybackChannels "2"
-               PlaybackPriority "500"
-               PlaybackVolume "name='Speaker Volume'"
-               PlaybackSwitch "name='Speaker Switch'"
-               PlaybackPCM "hw:${CardId},0"
-       }
-}
-
-SectionDevice."Headphones" {
-       Comment "Headphones"
-
-       ConflictingDevice [
-               "Handset"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='Headphone Switch' on,on"
-               cset "name='HPOUTL PGA' 0 unmute"
-               cset "name='HPOUTR PGA' 0 unmute"
-               cset "name='Headphone Aux Volume' 0"
-               cset "name='Headphone Volume' 121,121"
-       ]
-
-       DisableSequence [
-               cset "name='Headphone Switch' off off"
-               cset "name='HPOUTL PGA' 0 mute"
-               cset "name='HPOUTR PGA' 0 mute"
-       ]
-
-       Value {
-               PlaybackPriority "1000"
-               PlaybackChannels "2"
-               PlaybackVolume "name='Headphone Volume'"
-               PlaybackSwitch "name='Headphone Switch'"
-               PlaybackPCM "hw:${CardId},0"
-               JackControl "Headphones Jack"
-       }
-}
-
-SectionDevice."Mic" {
-       Comment "Internal Microphone"
-
-       ConflictingDevice [
-               "Headset"
-       ]
-
-       EnableSequence [
-               cset "name='Digital Capture Volume' 116,116"
-               cset "name='ADC L/R Swap Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Digital Capture Volume' 0,0"
-               cset "name='ADC L/R Swap Switch' off"
-       ]
-
-       Value {
-               CapturePriority "500"
-               CaptureChannels "2"
-               CaptureVolume "name='Digital Capture Volume'"
-               CapturePCM "hw:${CardId},0"
-       }
-}
-
-SectionDevice."Headset" {
-       Comment "Headset Microphone"
-
-       ConflictingDevice [
-               "Mic"
-       ]
-
-       EnableSequence [
-               cset "name='MIXINR IN3R Switch' on"
-               cset "name='MIXINR IN3R Volume' 7"
-       ]
-
-       DisableSequence [
-               cset "name='MIXINR IN3R Switch' off"
-               cset "name='MIXINR IN3R Volume' 0"
-       ]
-
-       Value {
-               CapturePriority "100"
-               CaptureChannels "2"
-               CaptureVolume "name='MIXINR IN3R Volume'"
-               CaptureSwitch "name='MIXINR IN3R Switch'"
-               CapturePCM "hw:${CardId},0"
-               JackControl "Headphones Jack"
-       }
-}
diff --git a/config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/Librem_5.conf b/config/default/b-librem5-phone/rootfs/usr/share/alsa/ucm2/Librem_5/Librem_5.conf
deleted file mode 100644 (file)
index d672df2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Syntax 2
-
-SectionUseCase."HiFi" {
-       File "HiFi.conf"
-       Comment "Default"
-}
diff --git a/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/HiFi.conf b/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/HiFi.conf
deleted file mode 100644 (file)
index 73c8ff6..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-SectionVerb {
-       EnableSequence [
-               # First of all, disable the internal speaker amplifier
-               cset "name='Internal Speaker Switch' off"
-
-               ### Based on /codecs/rt5640/EnableSeq.conf ###
-
-               # RT5640 default output routing
-               cset "name='DAC MIXL INF1 Switch' on"
-               cset "name='DAC MIXR INF1 Switch' on"
-               cset "name='DAC MIXL Stereo ADC Switch' off"
-               cset "name='DAC MIXR Stereo ADC Switch' off"
-               cset "name='Stereo DAC MIXL DAC L1 Switch' on"
-               cset "name='Stereo DAC MIXR DAC R1 Switch' on"
-               cset "name='Stereo DAC MIXL DAC L2 Switch' on"
-               cset "name='Stereo DAC MIXR DAC R2 Switch' on"
-               cset "name='OUT MIXL DAC L1 Switch' on"
-               cset "name='OUT MIXR DAC R1 Switch' on"
-               cset "name='SPK MIXL DAC L1 Switch' on"
-               cset "name='SPK MIXR DAC R1 Switch' on"
-
-               # uncomment to enable swap between AIF1 and AIF2
-               # warning: can only work with SSP0 firmware enabled
-               cset "name='SDI select' 0"
-               cset "name='DAI select' 0"
-               #cset "name='SDI select' 1"
-               #cset "name='DAI select' 1"
-
-               cset "name='DAC2 Playback Switch' on"
-
-               # Input Configuration
-               cset "name='Stereo ADC1 Mux' ADC"
-               cset "name='Stereo ADC2 Mux' DMIC1"
-               cset "name='ADC Capture Switch' on"
-
-               cset "name='Mono ADC L1 Mux' ADCL"
-               cset "name='Mono ADC R1 Mux' ADCR"
-               cset "name='Mono ADC L2 Mux' DMIC L1"
-               cset "name='Mono ADC R2 Mux' DMIC R1"
-               cset "name='Mono ADC Capture Switch' on"
-
-               # Set capture volume to 0dB so modem audio doesn't overdrive the ADC
-               cset "name='ADC Capture Volume' 47"
-               cset "name='Mono ADC Capture Volume' 47"
-
-               # The second 'Mono ADC' path does not have a 'Boost Gain',
-               # set this to 0dB so that the volume of the AIF1 and AIF2 paths is equal.
-               cset "name='ADC Boost Gain' 0"
-
-               # Set IN1 internal mic boost to 8 (max)
-               # Set IN2 headset-mic boost to 1, headset mics are quite loud
-               # Set IN3 (modem audio) boost to 0 as it's already loud enough
-               cset "name='IN1 Boost' 8"
-               cset "name='IN2 Boost' 1"
-               cset "name='IN3 Boost' 0"
-
-               # Start with all controls which are used by the individual
-               # input/output Enable/DisableSequences off
-
-               cset "name='RECMIXL BST1 Switch' off"
-               cset "name='RECMIXR BST1 Switch' off"
-               # IN2 is headset mic, make sure its route is enabled
-               cset "name='RECMIXL BST2 Switch' on"
-               cset "name='RECMIXR BST2 Switch' on"
-               cset "name='RECMIXL BST3 Switch' off"
-               cset "name='RECMIXR BST3 Switch' off"
-
-               cset "name='Stereo ADC MIXL ADC1 Switch' off"
-               cset "name='Stereo ADC MIXR ADC1 Switch' off"
-               cset "name='Stereo ADC MIXL ADC2 Switch' off"
-               cset "name='Stereo ADC MIXR ADC2 Switch' off"
-               cset "name='Mono ADC MIXL ADC1 Switch' off"
-               cset "name='Mono ADC MIXR ADC1 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' off"
-               cset "name='Mono ADC MIXR ADC2 Switch' off"
-
-               # Limit amplification factor of earpiece amplifier so sound stays clear
-               cset "name='Class D SPK Ratio Control' 1.66x"
-
-               # Turn off playback switches by default, otherwise both Speaker
-               # and headphones are playing audio initially until headphones are
-               # re-inserted.
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-               cset "name='Speaker L Playback Switch' off"
-               cset "name='Speaker R Playback Switch' off"
-
-               # MONO output is used as IN3 here, so make sure it's disabled
-               cset "name='Mono Playback Switch' off"
-
-               # Set playback volumes to 0dB
-               cset "name='HP Playback Volume' 31"
-               cset "name='Speaker Playback Volume' 31"
-       ]
-
-       DisableSequence [
-               # Turn off all output channels
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-               cset "name='HP Channel Switch' off"
-               cset "name='HPO MIX HPVOL Switch'  off"
-               cset "name='Speaker L Playback Switch' off"
-               cset "name='Speaker R Playback Switch' off"
-               cset "name='Speaker Channel Switch' off"
-               cset "name='SPOL MIX SPKVOL L Switch' off"
-               cset "name='SPOL MIX SPKVOL R Switch' off"
-
-
-               # Reset output routing
-               cset "name='DAC MIXL INF1 Switch' off"
-               cset "name='DAC MIXR INF1 Switch' off"
-               cset "name='OUT MIXL DAC L1 Switch' off"
-               cset "name='OUT MIXR DAC R1 Switch' off"
-               cset "name='SPK MIXL DAC L1 Switch' off"
-               cset "name='SPK MIXR DAC R1 Switch' off"
-       ]
-
-       Value {
-               TQ "HiFi"
-       }
-}
-
-SectionDevice."Earpiece" {
-       Comment "Internal Earpiece"
-
-       ConflictingDevice [
-               "Headphones"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='SPOL MIX SPKVOL L Switch' on"
-# for mono speaker we apply left on right
-#              cset "name='SPOR MIX SPKVOL R Switch' on"
-               cset "name='SPOL MIX SPKVOL R Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker L Playback Switch' on"
-               cset "name='Speaker R Playback Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Speaker Channel Switch' off"
-               cset "name='Speaker L Playback Switch' off"
-               cset "name='Speaker R Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 100
-               PlaybackPCM "hw:${CardId}"
-               PlaybackMixerElem "Speaker"
-               PlaybackVolume "Speaker Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Speaker" {
-       Comment "Internal Speaker"
-
-       ConflictingDevice [
-               "Earpiece"
-               "Headphones"
-       ]
-
-       EnableSequence [
-               cset "name='HPO MIX HPVOL Switch'  on"
-               cset "name='HP Channel Switch' on"
-               cset "name='HP L Playback Switch' on"
-               cset "name='HP R Playback Switch' on"
-               cset "name='Internal Speaker Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Internal Speaker Switch' off"
-               cset "name='HP Channel Switch' off"
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 200
-               PlaybackPCM "hw:${CardId}"
-               PlaybackMixerElem "HP"
-               PlaybackVolume "HP Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Headphones" {
-       Comment "Headphones"
-
-       ConflictingDevice [
-               "Earpiece"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='HPO MIX HPVOL Switch'  on"
-               cset "name='HP Channel Switch' on"
-               cset "name='HP L Playback Switch' on"
-               cset "name='HP R Playback Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='HP Channel Switch' off"
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 300
-               PlaybackPCM "hw:${CardId}"
-               JackControl "Headphones Jack"
-               PlaybackMixerElem "HP"
-               PlaybackVolume "HP Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Mic" {
-       Comment "Internal Microphone"
-
-       ConflictingDevice [
-               "Headset"
-       ]
-
-       EnableSequence [
-               cset "name='Mono ADC MIXL ADC2 Switch' on"
-               cset "name='Mono ADC MIXR ADC2 Switch' on"
-               cset "name='Stereo ADC MIXL ADC2 Switch' on"
-               cset "name='Stereo ADC MIXR ADC2 Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Mono ADC MIXL ADC2 Switch' off"
-               cset "name='Mono ADC MIXR ADC2 Switch' off"
-               cset "name='Stereo ADC MIXL ADC2 Switch' off"
-               cset "name='Stereo ADC MIXR ADC2 Switch' off"
-       ]
-
-       Value {
-               CapturePriority 100
-               CapturePCM "hw:${CardId}"
-               CaptureMixerElem "ADC"
-               CaptureVolume "ADC Capture Volume"
-               CaptureSwitch "ADC Capture Switch"
-       }
-}
-
-SectionDevice."Headset" {
-       Comment "Headset Microphone"
-
-       ConflictingDevice [
-               "Mic"
-       ]
-
-       EnableSequence [
-               cset "name='Mono ADC MIXL ADC1 Switch' on"
-               cset "name='Mono ADC MIXR ADC1 Switch' on"
-               cset "name='Stereo ADC MIXL ADC1 Switch' on"
-               cset "name='Stereo ADC MIXR ADC1 Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Mono ADC MIXL ADC1 Switch' off"
-               cset "name='Mono ADC MIXR ADC1 Switch' off"
-               cset "name='Stereo ADC MIXL ADC1 Switch' off"
-               cset "name='Stereo ADC MIXR ADC1 Switch' off"
-       ]
-
-       Value {
-               CapturePriority 200
-               CapturePCM "hw:${CardId}"
-               JackControl "Headphones Jack"
-               CaptureMixerElem "ADC"
-               CaptureVolume "ADC Capture Volume"
-               CaptureSwitch "ADC Capture Switch"
-       }
-}
diff --git a/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf b/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf
deleted file mode 100644 (file)
index c8ac020..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Syntax 4
-Comment "PinePhone Pro"
-
-SectionUseCase."HiFi" {
-       File "/PinePhonePro/HiFi.conf"
-       Comment "Play HiFi quality music"
-}
-
-SectionUseCase."Voice Call" {
-       File "/PinePhonePro/VoiceCall.conf"
-       Comment "Make a phone call"
-}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.codec-init.File "/codecs/rt5640/init.conf"
diff --git a/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/VoiceCall.conf b/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/PinePhonePro/VoiceCall.conf
deleted file mode 100644 (file)
index 8055e5d..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-SectionVerb {
-       EnableSequence [
-               # First of all, disable the internal speaker amplifier
-               cset "name='Internal Speaker Switch' off"
-
-               ### Based on /codecs/rt5640/EnableSeq.conf ###
-
-               # Get audio only from the microphones, not the system
-               cset "name='DAC MIXL INF1 Switch' off"
-               cset "name='DAC MIXR INF1 Switch' off"
-               cset "name='DAC MIXL Stereo ADC Switch' on"
-               cset "name='DAC MIXR Stereo ADC Switch' on"
-               cset "name='Stereo DAC MIXL DAC L1 Switch' on"
-               cset "name='Stereo DAC MIXR DAC R1 Switch' on"
-               cset "name='Stereo DAC MIXL DAC L2 Switch' on"
-               cset "name='Stereo DAC MIXR DAC R2 Switch' on"
-               cset "name='OUT MIXL DAC L1 Switch' off"
-               cset "name='OUT MIXR DAC R1 Switch' off"
-               cset "name='SPK MIXL DAC L1 Switch' off"
-               cset "name='SPK MIXR DAC R1 Switch' off"
-
-               # uncomment to enable swap between AIF1 and AIF2
-               # warning: can only work with SSP0 firmware enabled
-               cset "name='SDI select' 0"
-               cset "name='DAI select' 0"
-               #cset "name='SDI select' 1"
-               #cset "name='DAI select' 1"
-
-               cset "name='DAC2 Playback Switch' on"
-
-               # Input Configuration
-               cset "name='Stereo ADC1 Mux' ADC"
-               cset "name='Stereo ADC2 Mux' DMIC1"
-               cset "name='ADC Capture Switch' on"
-
-               cset "name='Mono ADC L1 Mux' ADCL"
-               cset "name='Mono ADC R1 Mux' ADCR"
-               cset "name='Mono ADC L2 Mux' DMIC L1"
-               cset "name='Mono ADC R2 Mux' DMIC R1"
-               cset "name='Mono ADC Capture Switch' on"
-
-               # Set capture volume to 0dB so modem audio doesn't overdrive the ADC
-               cset "name='ADC Capture Volume' 47"
-               cset "name='Mono ADC Capture Volume' 47"
-
-               # The second 'Mono ADC' path does not have a 'Boost Gain',
-               # set this to 0dB so that the volume of the AIF1 and AIF2 paths is equal.
-               cset "name='ADC Boost Gain' 0"
-
-               # Set IN1 internal mic boost to 8 (max)
-               # Set IN2 headset-mic boost to 1, headset mics are quite loud
-               # Set IN3 (modem audio) boost to 0 as it's already loud enough
-               cset "name='IN1 Boost' 8"
-               cset "name='IN2 Boost' 1"
-               cset "name='IN3 Boost' 0"
-
-               # Start with all controls which are used by the individual
-               # input/output Enable/DisableSequences off
-
-               cset "name='RECMIXL BST1 Switch' off"
-               cset "name='RECMIXR BST1 Switch' off"
-               # IN2 is headset mic, make sure its routed to the left channel
-               cset "name='RECMIXL BST2 Switch' on"
-               cset "name='RECMIXR BST2 Switch' off"
-               # IN3 is modem audio, route it to the right channel
-               cset "name='RECMIXL BST3 Switch' off"
-               cset "name='RECMIXR BST3 Switch' on"
-
-               cset "name='Stereo ADC MIXL ADC1 Switch' off"
-               cset "name='Stereo ADC MIXR ADC1 Switch' off"
-               cset "name='Stereo ADC MIXL ADC2 Switch' off"
-               cset "name='Stereo ADC MIXR ADC2 Switch' off"
-               cset "name='Mono ADC MIXL ADC1 Switch' off"
-               cset "name='Mono ADC MIXR ADC1 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' off"
-               cset "name='Mono ADC MIXR ADC2 Switch' off"
-
-               # Limit amplification factor of earpiece amplifier so sound stays clear
-               cset "name='Class D SPK Ratio Control' 1.66x"
-
-               # Loopback IN3 to earpiece/speaker/headphones
-               cset "name='OUT MIXR REC MIXR Switch' on"
-               cset "name='SPK MIXR OUT MIXR Switch' on"
-
-               # Send the left channel (microphones) to the modem through DAC L1
-               cset "name='LOUT MIX DAC L1 Switch' on"
-               # Don't use DAC R1 nor the OUTVOL blocks as we use them for
-               # routing audio from the modem
-               cset "name='LOUT MIX DAC R1 Switch' off"
-               cset "name='LOUT MIX OUTVOL L Switch' off"
-               cset "name='LOUT MIX OUTVOL R Switch' off"
-
-               # Disable left channel for HP (speaker/headphones) output
-               # as we're only routing modem audio to the right channel
-               cset "name='HP L Playback Switch' off"
-
-               # Turn off playback switches by default, otherwise both Speaker
-               # and headphones are playing audio initially until headphones are
-               # re-inserted.
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-               cset "name='Speaker L Playback Switch' off"
-               cset "name='Speaker R Playback Switch' off"
-
-               # MONO output is used as IN3 here, so make sure it's disabled
-               cset "name='Mono Playback Switch' off"
-
-               # Set playback volumes to 0dB
-               cset "name='HP Playback Volume' 31"
-               cset "name='Speaker Playback Volume' 31"
-       ]
-
-       DisableSequence [
-               # Turn off all output channels
-               cset "name='HP L Playback Switch' off"
-               cset "name='HP R Playback Switch' off"
-               cset "name='HP Channel Switch' off"
-               cset "name='Speaker L Playback Switch' off"
-               cset "name='Speaker R Playback Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               # Reset output routing
-               cset "name='DAC MIXL Stereo ADC Switch' off"
-               cset "name='DAC MIXR Stereo ADC Switch' off"
-               cset "name='OUT MIXR REC MIXR Switch' off"
-               cset "name='SPK MIXR OUT MIXR Switch' off"
-               cset "name='LOUT MIX DAC L1 Switch' off"
-
-               # Reset ADC input routing
-               cset "name='RECMIXL BST2 Switch' off"
-               cset "name='RECMIXR BST3 Switch' off"
-       ]
-
-       Value {
-               TQ "VoiceCall"
-       }
-}
-
-SectionDevice."Earpiece" {
-       Comment "Internal Earpiece"
-
-       ConflictingDevice [
-               "Headphones"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='SPOL MIX SPKVOL L Switch' on"
-               # Send right channel to left as it's mono only
-               cset "name='SPOL MIX SPKVOL R Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker L Playback Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Speaker Channel Switch' off"
-               cset "name='Speaker L Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 200
-               PlaybackPCM "hw:${CardId}"
-               PlaybackMixerElem "Speaker"
-               PlaybackVolume "Speaker Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Speaker" {
-       Comment "Internal Speaker"
-
-       ConflictingDevice [
-               "Earpiece"
-               "Headphones"
-       ]
-
-       EnableSequence [
-               cset "name='HPO MIX HPVOL Switch'  on"
-               cset "name='HP Channel Switch' on"
-               cset "name='HP R Playback Switch' on"
-               cset "name='Internal Speaker Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Internal Speaker Switch' off"
-               cset "name='HP Channel Switch' off"
-               cset "name='HP R Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 100
-               PlaybackPCM "hw:${CardId}"
-               PlaybackMixerElem "HP"
-               PlaybackVolume "HP Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Headphones" {
-       Comment "Headphones"
-
-       ConflictingDevice [
-               "Earpiece"
-               "Speaker"
-       ]
-
-       EnableSequence [
-               cset "name='HPO MIX HPVOL Switch'  on"
-               cset "name='HP Channel Switch' on"
-               cset "name='HP R Playback Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='HP Channel Switch' off"
-               cset "name='HP R Playback Switch' off"
-       ]
-
-       Value {
-               PlaybackPriority 300
-               PlaybackPCM "hw:${CardId}"
-               JackControl "Headphones Jack"
-               PlaybackMixerElem "HP"
-               PlaybackVolume "HP Playback Volume"
-               PlaybackMasterElem "DAC1"
-       }
-}
-
-SectionDevice."Mic" {
-       Comment "Internal Microphone"
-
-       ConflictingDevice [
-               "Headset"
-       ]
-
-       EnableSequence [
-               cset "name='Stereo ADC MIXL ADC2 Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Stereo ADC MIXL ADC2 Switch' off"
-       ]
-
-       Value {
-               CapturePriority 100
-               CapturePCM "hw:${CardId}"
-               CaptureMixerElem "ADC"
-               CaptureVolume "ADC Capture Volume"
-               CaptureSwitch "ADC Capture Switch"
-       }
-}
-
-SectionDevice."Headset" {
-       Comment "Headset Microphone"
-
-       ConflictingDevice [
-               "Mic"
-       ]
-
-       EnableSequence [
-               cset "name='Stereo ADC MIXL ADC1 Switch' on"
-       ]
-
-       DisableSequence [
-               cset "name='Stereo ADC MIXL ADC1 Switch' off"
-       ]
-
-       Value {
-               CapturePriority 200
-               CapturePCM "hw:${CardId}"
-               JackControl "Headphones Jack"
-               CaptureMixerElem "ADC"
-               CaptureVolume "ADC Capture Volume"
-               CaptureSwitch "ADC Capture Switch"
-       }
-}
diff --git a/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf b/config/default/b-pinephone-pro/rootfs/usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf
deleted file mode 120000 (symlink)
index 87e5a21..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf
\ No newline at end of file