Takashi Iwai
fb96ce2716
- Backport upstream fixes: cleanup and correctsion for ucm2: 0007-broxton-rt298-corrections-cleanups.patch 0008-bytcr-rt5640-cleanups-and-corrections.patch 0009-bytcr-rt5651-cleanups-and-corrections.patch 0010-bytcht-cx2072x-cleanups-and-corrections.patch 0011-bytcht-es8316-cleanups-and-corrections.patch 0012-DAISY-I2S-added-back-PCM-devices.patch 0013-DB410c-cleanups-and-corrections.patch 0014-DB820c-cleanups-and-corrections.patch 0015-Dell-WD15-Dock-cleaups-and-corrections.patch 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch 0017-cht-bsw-rt5672-fixes-and-corrections.patch 0018-chtnau8824-fixes-and-corrections.patch 0019-skylake-rt286-fixes-and-corrections.patch 0020-SDP4430-corrections-and-fixes.patch 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch 0024-VEYRON-I2S-corrections-and-fixes.patch 0025-SDP4430-corrections-and-fixes.patch 0026-chtrt5645-corrections-and-fixes.patch 0027-GoogleNyan-corrections-and-fixes.patch 0028-PAZ00-corrections-and-fixes.patch 0029-SDP4430-corrections-and-fixes.patch 0030-PandaBoard-corrections-and-fixes.patch 0031-PandaBoardES-corrections-and-fixes.patch 0032-kblrt5660-corrections-and-fixes.patch 0033-bytcr-rt5640-corrections-and-fixes.patch 0034-bytcht-es8316-corrections-and-fixes.patch 0035-sof-hda-dsp-corrections-and-fixes.patch OBS-URL: https://build.opensuse.org/request/show/774838 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=7
114 lines
2.9 KiB
Diff
114 lines
2.9 KiB
Diff
From 9b0f31cc65b558c0eee98be583b8a8108341e53d Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 23 Jan 2020 19:45:00 +0100
|
|
Subject: [PATCH 10/36] bytcht-cx2072x: cleanups and corrections
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/bytcht-cx2072x/HiFi.conf | 5 -----
|
|
ucm2/codecs/cx2072x/HeadPhones.conf | 4 +++-
|
|
ucm2/codecs/cx2072x/HeadsetMic.conf | 8 +++++---
|
|
ucm2/codecs/cx2072x/InternalMic.conf | 8 +++++---
|
|
ucm2/codecs/cx2072x/Speaker.conf | 4 +++-
|
|
5 files changed, 16 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/ucm2/bytcht-cx2072x/HiFi.conf b/ucm2/bytcht-cx2072x/HiFi.conf
|
|
index 60e022974790..b329ea4ed399 100644
|
|
--- a/ucm2/bytcht-cx2072x/HiFi.conf
|
|
+++ b/ucm2/bytcht-cx2072x/HiFi.conf
|
|
@@ -8,11 +8,6 @@ SectionVerb {
|
|
<codecs/cx2072x/DisableSeq.conf>
|
|
<platforms/bytcr/PlatformDisableSeq.conf>
|
|
]
|
|
-
|
|
- Value {
|
|
- PlaybackPCM "hw:${CardId}"
|
|
- CapturePCM "hw:${CardId}"
|
|
- }
|
|
}
|
|
|
|
<codecs/cx2072x/Speaker.conf>
|
|
diff --git a/ucm2/codecs/cx2072x/HeadPhones.conf b/ucm2/codecs/cx2072x/HeadPhones.conf
|
|
index b5d3d3a15402..484d020be7e8 100644
|
|
--- a/ucm2/codecs/cx2072x/HeadPhones.conf
|
|
+++ b/ucm2/codecs/cx2072x/HeadPhones.conf
|
|
@@ -16,7 +16,9 @@ SectionDevice."Headphones" {
|
|
]
|
|
|
|
Value {
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPriority 200
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
+ PlaybackChannels 2
|
|
JackControl "Headphone Jack"
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/cx2072x/HeadsetMic.conf b/ucm2/codecs/cx2072x/HeadsetMic.conf
|
|
index 0a59750f8f4a..b1a777114df4 100644
|
|
--- a/ucm2/codecs/cx2072x/HeadsetMic.conf
|
|
+++ b/ucm2/codecs/cx2072x/HeadsetMic.conf
|
|
@@ -1,8 +1,8 @@
|
|
-SectionDevice."HeadsetMic" {
|
|
+SectionDevice."Headset" {
|
|
Comment "Headset Microphone"
|
|
|
|
ConflictingDevice [
|
|
- "InternalMic"
|
|
+ "Mic"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -17,7 +17,9 @@ SectionDevice."HeadsetMic" {
|
|
]
|
|
|
|
Value {
|
|
- CaptureChannels "2"
|
|
+ CapturePriority 200
|
|
+ CapturePCM "hw:${CardId}"
|
|
+ CaptureChannels 2
|
|
JackControl "Headset Mic Jack"
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/cx2072x/InternalMic.conf b/ucm2/codecs/cx2072x/InternalMic.conf
|
|
index e358c35c1847..831c3cc63f5c 100644
|
|
--- a/ucm2/codecs/cx2072x/InternalMic.conf
|
|
+++ b/ucm2/codecs/cx2072x/InternalMic.conf
|
|
@@ -1,8 +1,8 @@
|
|
-SectionDevice."InternalMic" {
|
|
+SectionDevice."Mic" {
|
|
Comment "Internal Microphone"
|
|
|
|
ConflictingDevice [
|
|
- "HeadsetMic"
|
|
+ "Headset"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -17,6 +17,8 @@ SectionDevice."InternalMic" {
|
|
]
|
|
|
|
Value {
|
|
- CaptureChannels "2"
|
|
+ CapturePriority 100
|
|
+ CapturePCM "hw:${CardId}"
|
|
+ CaptureChannels 2
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/cx2072x/Speaker.conf b/ucm2/codecs/cx2072x/Speaker.conf
|
|
index a83aeae9a1d3..f60e3559d1f7 100644
|
|
--- a/ucm2/codecs/cx2072x/Speaker.conf
|
|
+++ b/ucm2/codecs/cx2072x/Speaker.conf
|
|
@@ -16,6 +16,8 @@ SectionDevice."Speaker" {
|
|
]
|
|
|
|
Value {
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPriority 100
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
+ PlaybackChannels 2
|
|
}
|
|
}
|
|
--
|
|
2.16.4
|
|
|