From: Jaroslav Kysela Date: Sun, 10 Nov 2019 19:28:23 +0000 (+0100) Subject: broxton-rt298: adapt to ucm2 X-Git-Tag: v1.2.1~15 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1cdca202d3f59b08213a7ff1d962ffbd15d996be;p=alsa-ucm-conf.git broxton-rt298: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- diff --git a/ucm/broxton-rt298/Hdmi1.conf b/ucm/broxton-rt298/Hdmi1.conf deleted file mode 100644 index 48514f4..0000000 --- a/ucm/broxton-rt298/Hdmi1.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."Hdmi1" { - Comment "HDMI/Display Port 1 Stereo" - - EnableSequence [ - exec "echo Hdmi1 EnableSequnece" - ] - - DisableSequence [ - exec "echo Hdmi1 DisableSequnece" - ] - - Value { - PlaybackPCM "hw:broxtonrt298,4" - PlaybackChannels "2" - PlaybackPriority "3" - JackControl "HDMI/DP, pcm=4 Jack" - } -} - diff --git a/ucm/broxton-rt298/Hdmi2.conf b/ucm/broxton-rt298/Hdmi2.conf deleted file mode 100644 index 764f8b9..0000000 --- a/ucm/broxton-rt298/Hdmi2.conf +++ /dev/null @@ -1,14 +0,0 @@ -# Usecase for device HDMI2/Display Port stereo playback on Intel Broxton platforms -# For Audio in I2S mode - -SectionDevice."Hdmi2" { - Comment "HDMI/Display Port 2 Stereo" - - Value { - PlaybackPCM "hw:broxtonrt298,5" - PlaybackChannels "2" - PlaybackPriority "4" - JackControl "HDMI/DP, pcm=5 Jack" - } -} - diff --git a/ucm2/broxton-rt298/Hdmi1.conf b/ucm2/broxton-rt298/Hdmi1.conf new file mode 100644 index 0000000..ede176b --- /dev/null +++ b/ucm2/broxton-rt298/Hdmi1.conf @@ -0,0 +1,23 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPCM "hw:${CardId},4" + PlaybackPriority "3" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + JackControl "HDMI/DP,pcm=4 Jack" + } + False { + JackControl "HDMI/DP, pcm=4 Jack" + } + } + } +} diff --git a/ucm2/broxton-rt298/Hdmi2.conf b/ucm2/broxton-rt298/Hdmi2.conf new file mode 100644 index 0000000..9718bae --- /dev/null +++ b/ucm2/broxton-rt298/Hdmi2.conf @@ -0,0 +1,23 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPCM "hw:${CardId},5" + PlaybackPriority "4" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + JackControl "HDMI/DP,pcm=5 Jack" + } + False { + JackControl "HDMI/DP, pcm=5 Jack" + } + } + } +} diff --git a/ucm/broxton-rt298/HiFi.conf b/ucm2/broxton-rt298/HiFi.conf similarity index 70% rename from ucm/broxton-rt298/HiFi.conf rename to ucm2/broxton-rt298/HiFi.conf index 2e2d6fe..630d5e1 100644 --- a/ucm/broxton-rt298/HiFi.conf +++ b/ucm2/broxton-rt298/HiFi.conf @@ -4,22 +4,17 @@ SectionVerb { EnableSequence [ - cdev "hw:broxtonrt298" cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" ] - DisableSequence [ - cdev "hw:broxtonrt298" - ] - Value { TQ "HiFi" - CapturePCM "hw:broxtonrt298,1" - PlaybackPCM "hw:broxtonrt298,0" + CapturePCM "hw:${CardId},1" + PlaybackPCM "hw:${CardId},0" } } -SectionDevice."dmiccap" { +SectionDevice."DigitalMic" { Comment "DMIC Stereo" ConflictingDevice [ @@ -27,9 +22,6 @@ SectionDevice."dmiccap" { ] EnableSequence [ - - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 dmiccap called" cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" cset "name='media0_out mo codec0_in mi Switch' 0" cset "name='Mic Jack Switch' 0" @@ -37,16 +29,11 @@ SectionDevice."dmiccap" { ] DisableSequence [ - cdev "hw:broxtonrt298" cset "name='media0_out mo codec0_in mi Switch' 1" cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" cset "name='Mic Jack Switch' 1" cset "name='ADC 0 Mux' 0" ] - Value { - CaptureChannels "2" - CapturePriority "2" - } } SectionDevice."Headphones" { @@ -55,21 +42,15 @@ SectionDevice."Headphones" { ConflictingDevice [ "Speaker" ] + EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 Headphone called" cset "name='HPO L Switch' 1" cset "name='HPO R Switch' 1" cset "name='Headphone Jack Switch' 1" cset "name='Speaker Playback Switch' 0,0" ] - DisableSequence [ - cdev "hw:broxtonrt298" - ] Value { - PlaybackChannels "2" - PlaybackPriority "1" JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -81,9 +62,8 @@ SectionDevice."Speaker" { ConflictingDevice [ "Headphones" ] + EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 speaker called" cset "name='SPO Switch' 1" cset "name='Speaker Playback Switch' 1,1" cset "name='Speaker Switch' 1" @@ -91,11 +71,7 @@ SectionDevice."Speaker" { cset "name='HPO R Switch' 0" ] - DisableSequence [ - ] Value { - PlaybackChannels "2" - PlaybackPriority "1" JackHWMute "Headphones" } } @@ -104,11 +80,10 @@ SectionDevice."Headset" { Comment "Headset Mic" ConflictingDevice [ - "dmiccap" + "DigitalMic" ] + EnableSequence [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 Headset called" cset "name='media0_out mo codec0_in mi Switch' 1" cset "name='ADC0 Capture Volume' 105,105" cset "name='ADC 0 Mux' 0" @@ -117,13 +92,11 @@ SectionDevice."Headset" { ] DisableSequence [ - cdev "hw:broxtonrt298" cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" cset "name='media0_out mo codec0_in mi Switch' 0" ] + Value { - CaptureChannels "2" - CapturePriority "2" JackControl "Mic Jack" } } diff --git a/ucm/broxton-rt298/broxton-rt298.conf b/ucm2/broxton-rt298/broxton-rt298.conf similarity index 92% rename from ucm/broxton-rt298/broxton-rt298.conf rename to ucm2/broxton-rt298/broxton-rt298.conf index 15c958e..8752e91 100644 --- a/ucm/broxton-rt298/broxton-rt298.conf +++ b/ucm2/broxton-rt298/broxton-rt298.conf @@ -1,6 +1,8 @@ # UCM for Intel Broxton platforms # For Audio in I2S mode +Syntax 2 + SectionUseCase."HiFi" { File "HiFi.conf" Comment "Play and record HiFi quality Music" @@ -17,15 +19,13 @@ SectionUseCase."Hdmi2" { } ValueDefaults { - PlaybackCTL "hw:broxtonrt298" - CaptureCTL "hw:broxtonrt298" + PlaybackChannels "2" + PlaybackPriority "1" CaptureChannels "2" CapturePriority "2" } SectionDefaults [ - cdev "hw:broxtonrt298" - exec "echo broxtonrt298 CONF Defaults" cset "name='Headphone Jack Switch' 1" cset "name='Speaker Switch' 1" cset "name='Speaker Playback Switch' 0,0"