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
162 lines
4.2 KiB
Diff
162 lines
4.2 KiB
Diff
From 1e2eddb7e38474f239f9c8f9387c7a04a1bff7e3 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 5 Feb 2020 03:13:06 +0100
|
|
Subject: [PATCH 33/36] bytcr-rt5640: corrections and fixes
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/bytcr-rt5640/HiFi.conf | 5 -----
|
|
ucm2/codecs/rt5640/DigitalMics.conf | 2 +-
|
|
ucm2/codecs/rt5640/HeadPhones.conf | 3 +--
|
|
ucm2/codecs/rt5640/HeadsetMic.conf | 2 +-
|
|
ucm2/codecs/rt5640/IN1-InternalMic.conf | 4 ++--
|
|
ucm2/codecs/rt5640/IN3-InternalMic.conf | 2 +-
|
|
ucm2/codecs/rt5640/MonoSpeaker.conf | 3 +--
|
|
ucm2/codecs/rt5640/Speaker.conf | 3 +--
|
|
8 files changed, 8 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf
|
|
index a616106d38c3..e71eb2266110 100644
|
|
--- a/ucm2/bytcr-rt5640/HiFi.conf
|
|
+++ b/ucm2/bytcr-rt5640/HiFi.conf
|
|
@@ -10,11 +10,6 @@ SectionVerb {
|
|
DisableSequence [
|
|
<platforms/bytcr/PlatformDisableSeq.conf>
|
|
]
|
|
-
|
|
- Value {
|
|
- PlaybackPCM "hw:${CardId}"
|
|
- CapturePCM "hw:${CardId}"
|
|
- }
|
|
}
|
|
|
|
If.0 {
|
|
diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
|
|
index 17cae1953677..9cd8a8c4d9cd 100644
|
|
--- a/ucm2/codecs/rt5640/DigitalMics.conf
|
|
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
|
|
@@ -21,7 +21,7 @@ SectionDevice."Mic" {
|
|
|
|
Value {
|
|
CapturePriority 100
|
|
- CapturePCM "hw:${CardId},0"
|
|
+ CapturePCM "hw:${CardId}"
|
|
CaptureChannels 2
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
|
|
index dccc943490c1..7859b7a6bfb3 100644
|
|
--- a/ucm2/codecs/rt5640/HeadPhones.conf
|
|
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
|
|
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
|
|
|
|
ConflictingDevice [
|
|
"Speaker"
|
|
- "MonoSpeaker"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -33,7 +32,7 @@ SectionDevice."Headphones" {
|
|
|
|
Value {
|
|
PlaybackPriority 300
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
PlaybackChannels 2
|
|
JackControl "Headphone Jack"
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
|
|
index f6d9423963ac..40e0abedd5f7 100644
|
|
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
|
|
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
|
|
@@ -37,7 +37,7 @@ SectionDevice."Headset" {
|
|
|
|
Value {
|
|
CapturePriority 200
|
|
- CapturePCM "hw:${CardId},0"
|
|
+ CapturePCM "hw:${CardId}"
|
|
CaptureChannels 2
|
|
JackControl "Headset Mic Jack"
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
|
|
index 435cce83dc13..7d76c4f17d41 100644
|
|
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
|
|
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
|
|
@@ -2,7 +2,7 @@ SectionDevice."Mic" {
|
|
Comment "Internal Microphone on IN1"
|
|
|
|
ConflictingDevice [
|
|
- "HeadsetMic"
|
|
+ "Headset"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -40,7 +40,7 @@ SectionDevice."Mic" {
|
|
|
|
Value {
|
|
CapturePriority 100
|
|
- CapturePCM "hw:${CardId},0"
|
|
+ CapturePCM "hw:${CardId}"
|
|
CaptureChannels 2
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
|
|
index 4d4060e23324..2df29386d1f8 100644
|
|
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
|
|
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
|
|
@@ -40,7 +40,7 @@ SectionDevice."Mic" {
|
|
|
|
Value {
|
|
CapturePriority 100
|
|
- CapturePCM "hw:${CardId},0"
|
|
+ CapturePCM "hw:${CardId}"
|
|
CaptureChannels 2
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
|
|
index 6ca51e2397d1..70ab80922fb1 100644
|
|
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
|
|
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
|
|
@@ -3,7 +3,6 @@ SectionDevice."Speaker" {
|
|
|
|
ConflictingDevice [
|
|
"Headphones"
|
|
- "Speaker"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -38,7 +37,7 @@ SectionDevice."Speaker" {
|
|
|
|
Value {
|
|
PlaybackPriority 100
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
PlaybackChannels 2
|
|
}
|
|
}
|
|
diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
|
|
index 09b99cf6410d..3b4b2968fb56 100644
|
|
--- a/ucm2/codecs/rt5640/Speaker.conf
|
|
+++ b/ucm2/codecs/rt5640/Speaker.conf
|
|
@@ -3,7 +3,6 @@ SectionDevice."Speaker" {
|
|
|
|
ConflictingDevice [
|
|
"Headphones"
|
|
- "MonoSpeaker"
|
|
]
|
|
|
|
EnableSequence [
|
|
@@ -37,8 +36,8 @@ SectionDevice."Speaker" {
|
|
]
|
|
|
|
Value {
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
PlaybackPriority 100
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
PlaybackChannels 2
|
|
}
|
|
}
|
|
--
|
|
2.16.4
|
|
|