diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2020-02-05 03:24:00 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2020-02-05 13:17:24 +0100 |
| commit | acf80f98692ab6f409e77cddb1bb55b387da4b17 (patch) | |
| tree | c4e39798b6b6e00f663e517b0f382a638e7f0497 | |
| parent | 6a1044da7b104251502421c56c9be42407bd9281 (diff) | |
sof-hda-dsp: corrections and fixes
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| -rw-r--r-- | ucm2/sof-hda-dsp/HDA-Capture-value.conf | 4 | ||||
| -rw-r--r-- | ucm2/sof-hda-dsp/Hdmi.conf | 6 | ||||
| -rw-r--r-- | ucm2/sof-hda-dsp/HiFi.conf | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ucm2/sof-hda-dsp/HDA-Capture-value.conf b/ucm2/sof-hda-dsp/HDA-Capture-value.conf index b3e90aa..5f3c2a3 100644 --- a/ucm2/sof-hda-dsp/HDA-Capture-value.conf +++ b/ucm2/sof-hda-dsp/HDA-Capture-value.conf @@ -1,5 +1,5 @@ -CapturePCM "hw:${CardId},0" +CapturePCM "hw:${CardId}" CaptureMixerElem "Capture" CaptureVolume "Capture Volume" CaptureSwitch "Capture Switch" -CaptureChannels "2" +CaptureChannels 2 diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf index 7418fa7..1982c72 100644 --- a/ucm2/sof-hda-dsp/Hdmi.conf +++ b/ucm2/sof-hda-dsp/Hdmi.conf @@ -14,7 +14,7 @@ SectionDevice."HDMI1" { Value { PlaybackPriority 500 PlaybackPCM "hw:${CardId},3" - PlaybackChannels "2" + PlaybackChannels 2 JackControl "HDMI/DP,pcm=3 Jack" } } @@ -33,7 +33,7 @@ SectionDevice."HDMI2" { Value { PlaybackPriority 600 PlaybackPCM "hw:${CardId},4" - PlaybackChannels "2" + PlaybackChannels 2 JackControl "HDMI/DP,pcm=4 Jack" } } @@ -52,7 +52,7 @@ SectionDevice."HDMI3" { Value { PlaybackPriority 700 PlaybackPCM "hw:${CardId},5" - PlaybackChannels "2" + PlaybackChannels 2 JackControl "HDMI/DP,pcm=5 Jack" } } diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf index 71cef49..6dfdabe 100644 --- a/ucm2/sof-hda-dsp/HiFi.conf +++ b/ucm2/sof-hda-dsp/HiFi.conf @@ -19,12 +19,12 @@ SectionDevice."Headphones1" { Value { PlaybackPriority 200 - PlaybackPCM "hw:${CardId},0" + PlaybackPCM "hw:${CardId}" PlaybackMixerElem "Headphone" PlaybackMasterElem "Master" PlaybackVolume "Headphone Playback Volume" PlaybackSwitch "Headphone Playback Switch" - PlaybackChannels "2" + PlaybackChannels 2 If.jack { Condition { Type ControlExists @@ -72,12 +72,12 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 - PlaybackPCM "hw:${CardId},0" + PlaybackPCM "hw:${CardId}" PlaybackMixerElem "Speaker" PlaybackMasterElem "Master" PlaybackVolume "Speaker Playback Volume" PlaybackSwitch "Speaker Playback Switch" - PlaybackChannels "2" + PlaybackChannels 2 } } @@ -93,7 +93,7 @@ If.monomic { Comment "Headphones Stereo Microphone" ConflictingDevice [ - "HeadsetMic" + "Headset" ] EnableSequence [ @@ -147,10 +147,10 @@ SectionDevice."Mic" { Needle "cfg-dmics:4" } True { - CaptureChannels "4" + CaptureChannels 4 } False { - CaptureChannels "2" + CaptureChannels 2 } } If.vol { |