diff options
Diffstat (limited to 'ucm2/codecs')
-rw-r--r-- | ucm2/codecs/rt5672/DMIC1.conf | 8 | ||||
-rw-r--r-- | ucm2/codecs/rt5672/DMIC2.conf | 8 | ||||
-rw-r--r-- | ucm2/codecs/rt5672/HeadPhones.conf | 8 | ||||
-rw-r--r-- | ucm2/codecs/rt5672/HeadsetMic.conf | 10 | ||||
-rw-r--r-- | ucm2/codecs/rt5672/MonoSpeaker.conf | 8 | ||||
-rw-r--r-- | ucm2/codecs/rt5672/Speaker.conf | 10 |
6 files changed, 32 insertions, 20 deletions
diff --git a/ucm2/codecs/rt5672/DMIC1.conf b/ucm2/codecs/rt5672/DMIC1.conf index b3da627..73983af 100644 --- a/ucm2/codecs/rt5672/DMIC1.conf +++ b/ucm2/codecs/rt5672/DMIC1.conf @@ -1,9 +1,9 @@ -SectionDevice."DigitalMic-DMIC1" { +SectionDevice."Mic1" { Comment "Internal Digital Microphone on DMIC1" ConflictingDevice [ - "DigitalMic-DMIC2" - "HeadsetMic" + "Mic2" + "Headset" ] EnableSequence [ @@ -21,6 +21,8 @@ SectionDevice."DigitalMic-DMIC1" { ] Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" CaptureChannels 2 } } diff --git a/ucm2/codecs/rt5672/DMIC2.conf b/ucm2/codecs/rt5672/DMIC2.conf index 38fe015..751c95c 100644 --- a/ucm2/codecs/rt5672/DMIC2.conf +++ b/ucm2/codecs/rt5672/DMIC2.conf @@ -1,9 +1,9 @@ -SectionDevice."DigitalMic-DMIC2" { +SectionDevice."Mic2" { Comment "Internal Digital Microphone on DMIC2" ConflictingDevice [ - "DigitalMic-DMIC1" - "HeadsetMic" + "Mic1" + "Headset" ] EnableSequence [ @@ -21,6 +21,8 @@ SectionDevice."DigitalMic-DMIC2" { ] Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" CaptureChannels 2 } } diff --git a/ucm2/codecs/rt5672/HeadPhones.conf b/ucm2/codecs/rt5672/HeadPhones.conf index 350fb2b..0542f77 100644 --- a/ucm2/codecs/rt5672/HeadPhones.conf +++ b/ucm2/codecs/rt5672/HeadPhones.conf @@ -2,8 +2,8 @@ SectionDevice."Headphones" { Comment "Headphones" ConflictingDevice [ - "Speaker" - "MonoSpeaker" + "Speaker1" + "Speaker2" ] EnableSequence [ @@ -15,7 +15,9 @@ SectionDevice."Headphones" { ] Value { - PlaybackChannels "2" + PlaybackPriority 300 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 JackControl "Headphone Jack" } } diff --git a/ucm2/codecs/rt5672/HeadsetMic.conf b/ucm2/codecs/rt5672/HeadsetMic.conf index fd02cb3..f407579 100644 --- a/ucm2/codecs/rt5672/HeadsetMic.conf +++ b/ucm2/codecs/rt5672/HeadsetMic.conf @@ -1,9 +1,9 @@ -SectionDevice."HeadsetMic" { +SectionDevice."Headset" { Comment "Headset Microphone" ConflictingDevice [ - "DigitalMic-DMIC1" - "DigitalMic-DMIC2" + "Mic1" + "Mic2" ] EnableSequence [ @@ -30,7 +30,9 @@ SectionDevice."HeadsetMic" { ] Value { - CaptureChannels "2" + CapturePriority 300 + CapturePCM "hw:${CardId}" + CaptureChannels 2 JackControl "Headset Mic Jack" } } diff --git a/ucm2/codecs/rt5672/MonoSpeaker.conf b/ucm2/codecs/rt5672/MonoSpeaker.conf index 6308ad9..0849c67 100644 --- a/ucm2/codecs/rt5672/MonoSpeaker.conf +++ b/ucm2/codecs/rt5672/MonoSpeaker.conf @@ -1,8 +1,8 @@ -SectionDevice."MonoSpeaker" { +SectionDevice."Speaker2" { Comment "Mono Speaker" ConflictingDevice [ - "Speaker" + "Speaker1" "Headphones" ] @@ -19,6 +19,8 @@ SectionDevice."MonoSpeaker" { ] Value { - PlaybackChannels "2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } } diff --git a/ucm2/codecs/rt5672/Speaker.conf b/ucm2/codecs/rt5672/Speaker.conf index e4391cc..44e73aa 100644 --- a/ucm2/codecs/rt5672/Speaker.conf +++ b/ucm2/codecs/rt5672/Speaker.conf @@ -1,8 +1,8 @@ -SectionDevice."Speaker" { - Comment "Speakers" +SectionDevice."Speaker1" { + Comment "Stereo Speakers" ConflictingDevice [ - "MonoSpeaker" + "Speaker2" "Headphones" ] @@ -15,6 +15,8 @@ SectionDevice."Speaker" { ] Value { - PlaybackChannels "2" + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } } |