From 2a5d47b739f88031f66113611d12262d22f81984 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 11 Nov 2019 08:53:41 +0100 Subject: [PATCH] PandaBoard: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- ucm/PandaBoard/PandaBoard.conf | 45 ------------------------- {ucm => ucm2}/PandaBoard/FMAnalog.conf | 8 ++--- {ucm => ucm2}/PandaBoard/HiFi.conf | 35 ++----------------- {ucm => ucm2}/PandaBoard/HiFiLP.conf | 8 ++--- ucm2/PandaBoard/PandaBoard.conf | 43 +++++++++++++++++++++++ {ucm => ucm2}/PandaBoard/Record.conf | 8 ++--- {ucm => ucm2}/PandaBoard/Voice.conf | 8 ++--- {ucm => ucm2}/PandaBoard/VoiceCall.conf | 10 ++---- 8 files changed, 56 insertions(+), 109 deletions(-) delete mode 100644 ucm/PandaBoard/PandaBoard.conf rename {ucm => ucm2}/PandaBoard/FMAnalog.conf (82%) rename {ucm => ucm2}/PandaBoard/HiFi.conf (66%) rename {ucm => ucm2}/PandaBoard/HiFiLP.conf (84%) create mode 100644 ucm2/PandaBoard/PandaBoard.conf rename {ucm => ucm2}/PandaBoard/Record.conf (85%) rename {ucm => ucm2}/PandaBoard/Voice.conf (83%) rename {ucm => ucm2}/PandaBoard/VoiceCall.conf (89%) diff --git a/ucm/PandaBoard/PandaBoard.conf b/ucm/PandaBoard/PandaBoard.conf deleted file mode 100644 index 52fd551..0000000 --- a/ucm/PandaBoard/PandaBoard.conf +++ /dev/null @@ -1,45 +0,0 @@ -# UCM configuration for PandaBoard -SectionUseCase."Record" { - File "Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "Voice.conf" - Comment "Playback Voice quality" -} - -SectionUseCase."Voice_Low_Power" { - File "Voice.conf" - Comment "Playback Voice quality in Low Power Mode" -} - -SectionUseCase."Voice_Call" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" - Comment "Capture FM Analog Radio" -} - -SectionDefaults [ - cdev "hw:PandaBoard" - exec "echo Im setting defaults" -] diff --git a/ucm/PandaBoard/FMAnalog.conf b/ucm2/PandaBoard/FMAnalog.conf similarity index 82% rename from ucm/PandaBoard/FMAnalog.conf rename to ucm2/PandaBoard/FMAnalog.conf index f1b4477..11a2288 100644 --- a/ucm/PandaBoard/FMAnalog.conf +++ b/ucm2/PandaBoard/FMAnalog.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" cset "name='AMIC_UL PDM Switch' 1" cset "name='MUX_UL00' 9" cset "name='MUX_UL01' 10" @@ -12,7 +11,6 @@ SectionVerb { DisableSequence [ - cdev "hw:PandaBoard" cset "name='AMIC_UL PDM Switch' 0" cset "name='MUX_UL00' 0" cset "name='MUX_UL01' 0" @@ -22,22 +20,20 @@ SectionVerb { # Optional TQ and ALSA PCMs Value { TQ "Music" - CapturePCM "hw:0,0" + CapturePCM "hw:${CardId},0" } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 2" cset "name='Analog Right Capture Route' 2" cset "name='Capture Preamplifier Volume' 2" ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 3" cset "name='Analog Right Capture Route' 3" cset "name='Capture Preamplifier Volume' 0" diff --git a/ucm/PandaBoard/HiFi.conf b/ucm2/PandaBoard/HiFi.conf similarity index 66% rename from ucm/PandaBoard/HiFi.conf rename to ucm2/PandaBoard/HiFi.conf index db405a4..1b16125 100644 --- a/ucm/PandaBoard/HiFi.conf +++ b/ucm2/PandaBoard/HiFi.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Multimedia' 1" cset "name='Sidetone Mixer Playback' 1" cset "name='DL1 PDM Switch' 1" @@ -16,7 +15,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Multimedia' 0" cset "name='Sidetone Mixer Playback' 0" cset "name='DL1 PDM Switch' 0" @@ -31,53 +29,24 @@ SectionVerb { # Optional TQ and ALSA PCMs # Value { # TQ "Music" -# PlaybackPCM "hw:0,0" +# PlaybackPCM "hw:${CardId},0" # PlaybackVolume "name='DL1 Media Playback Volume' 90,90" # PlaybackSwitch "name='DL1 PDM Switch' 1" # } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Left Playback' 1" cset "name='Headset Right Playback' 1" cset "name='Headset Playback Volume' 13" ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Right Playback' 0" cset "name='Headset Left Playback' 0" cset "name='Headset Playback Volume' 0" ] } - -#SectionModifier."RecordMedia".0 { -# SupportedDevice [ -# "Headset" -# ] - # EnableSequence [ - # .... - # ] - # - # DisableSequence [ - # ... - # ] - # - # TransitionSequence."ToModifierName" [ - # ... - # ] - # - # # Optional TQ and ALSA PCMs - # Value { - # TQ Voice - # CapturePCM "hw:1" - # PlaybackVolume "name='Master Playback Volume',index=2" - # PlaybackSwitch "name='Master Playback Switch',index=2" - # } -# -#} - diff --git a/ucm/PandaBoard/HiFiLP.conf b/ucm2/PandaBoard/HiFiLP.conf similarity index 84% rename from ucm/PandaBoard/HiFiLP.conf rename to ucm2/PandaBoard/HiFiLP.conf index 7bbbd5d..92de382 100644 --- a/ucm/PandaBoard/HiFiLP.conf +++ b/ucm2/PandaBoard/HiFiLP.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Multimedia' 1" cset "name='Sidetone Mixer Playback' 1" cset "name='DL1 PDM Switch' 1" @@ -12,7 +11,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Multimedia' 0" cset "name='Sidetone Mixer Playback' 0" cset "name='DL1 PDM Switch' 0" @@ -23,22 +21,20 @@ SectionVerb { # Optional TQ and ALSA PCMs Value { TQ "Music" - PlaybackPCM "hw:0,6" + PlaybackPCM "hw:${CardId},6" } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Left Playback' 1" cset "name='Headset Right Playback' 1" cset "name='Headset Playback Volume' 13" ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Right Playback' 0" cset "name='Headset Left Playback' 0" cset "name='Headset Playback Volume' 0" diff --git a/ucm2/PandaBoard/PandaBoard.conf b/ucm2/PandaBoard/PandaBoard.conf new file mode 100644 index 0000000..b7fbba1 --- /dev/null +++ b/ucm2/PandaBoard/PandaBoard.conf @@ -0,0 +1,43 @@ +# UCM configuration for PandaBoard + +Syntax 2 + +SectionUseCase."Record" { + File "Record.conf" + Comment "Record" +} + +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."HiFi_Low_Power" { + File "HiFiLP.conf" + Comment "Play HiFi quality Music in Low Power Mode" +} + +SectionUseCase."Voice" { + File "Voice.conf" + Comment "Playback Voice quality" +} + +SectionUseCase."Voice_Low_Power" { + File "Voice.conf" + Comment "Playback Voice quality in Low Power Mode" +} + +SectionUseCase."Voice_Call" { + File "VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."Voice_Call_IP" { + File "VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."FM_Analog_Radio" { + File "FMAnalog.conf" + Comment "Capture FM Analog Radio" +} diff --git a/ucm/PandaBoard/Record.conf b/ucm2/PandaBoard/Record.conf similarity index 85% rename from ucm/PandaBoard/Record.conf rename to ucm2/PandaBoard/Record.conf index 0eaf117..1fbe74c 100644 --- a/ucm/PandaBoard/Record.conf +++ b/ucm2/PandaBoard/Record.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" # No more AMIC PDM Switch in current kernels #cset "name='AMIC_UL PDM Switch' 1" cset "name='MUX_UL00' 9" @@ -12,7 +11,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:PandaBoard" # No more AMIC PDM Switch in current kernels #cset "name='AMIC_UL PDM Switch' 0" cset "name='MUX_UL00' 0" @@ -23,23 +21,21 @@ SectionVerb { # Optional TQ and ALSA PCMs Value { TQ "Music" - CapturePCM "hw:0,0" + CapturePCM "hw:${CardId},0" } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 0" cset "name='Analog Right Capture Route' 0" cset "name='Capture Preamplifier Volume' 2" ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 3" cset "name='Analog Right Capture Route' 3" cset "name='Capture Preamplifier Volume' 0" diff --git a/ucm/PandaBoard/Voice.conf b/ucm2/PandaBoard/Voice.conf similarity index 83% rename from ucm/PandaBoard/Voice.conf rename to ucm2/PandaBoard/Voice.conf index 4861071..42af48a 100644 --- a/ucm/PandaBoard/Voice.conf +++ b/ucm2/PandaBoard/Voice.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Voice' 1" cset "name='Sidetone Mixer Playback' 1" cset "name='DL1 PDM Switch' 1" @@ -12,7 +11,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='DL1 Mixer Voice' 0" cset "name='Sidetone Mixer Playback' 0" cset "name='DL1 PDM Switch' 0" @@ -23,22 +21,20 @@ SectionVerb { # Optional TQ and ALSA PCMs Value { TQ "Voice" - PlaybackPCM "hw:0,2" + PlaybackPCM "hw:${CardId},2" } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Left Playback' 1" cset "name='Headset Right Playback' 1" cset "name='Headset Playback Volume' 13" ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Headset Right Playback' 0" cset "name='Headset Left Playback' 0" cset "name='Headset Playback Volume' 0" diff --git a/ucm/PandaBoard/VoiceCall.conf b/ucm2/PandaBoard/VoiceCall.conf similarity index 89% rename from ucm/PandaBoard/VoiceCall.conf rename to ucm2/PandaBoard/VoiceCall.conf index d3c9501..c20bf5c 100644 --- a/ucm/PandaBoard/VoiceCall.conf +++ b/ucm2/PandaBoard/VoiceCall.conf @@ -3,7 +3,6 @@ SectionVerb { EnableSequence [ - cdev "hw:PandaBoard" cset "name='AMIC_UL PDM Switch' 1" cset "name='Sidetone Mixer Capture' 1" cset "name='MUX_VX0' 9" @@ -19,7 +18,6 @@ SectionVerb { DisableSequence [ - cdev "hw:PandaBoard" cset "name='AMIC_UL PDM Switch' 0" cset "name='Sidetone Mixer Capture' 0" cset "name='MUX_VX0' 0" @@ -36,16 +34,15 @@ SectionVerb { # Optional TQ and ALSA PCMs Value { TQ "Voice" - CapturePCM "hw:0,2" - PlaybackPCM "hw:0,2" + CapturePCM "hw:${CardId},2" + PlaybackPCM "hw:${CardId},2" } } -SectionDevice."Headset".0 { +SectionDevice."Headset" { Comment "PandaBoard 3.5mm Headset" EnableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 0" cset "name='Analog Right Capture Route' 0" cset "name='Capture Preamplifier Volume' 2" @@ -55,7 +52,6 @@ SectionDevice."Headset".0 { ] DisableSequence [ - cdev "hw:PandaBoard" cset "name='Analog Left Capture Route' 3" cset "name='Analog Right Capture Route' 3" cset "name='Capture Preamplifier Volume' 0" -- 2.47.1