Takashi Iwai
899638c0ac
- Update from alsa-ucm-conf git (commit 3048ff7b15a9): mainly for adding the support for sof-soundwire (bsc#1176200): 0001-bytcr-rt5640-Fix-DMIC1-not-working-when-connected-ov.patch 0002-bytcr-rt5651-Fix-high-noise-level-soft-input-on-DMIC.patch 0003-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T101HA-1.0.conf-sy.patch 0004-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch 0005-ucm2-use-Include-Syntax-3.patch 0006-chtrt5645-merge-all-possible-configurations-to-HiFi..patch 0007-cht-bsw-rt5672-merge-all-possible-configurations-to-.patch 0008-chtnau8824-merge-all-possible-configurations-to-HiFi.patch 0009-ucm.conf-add-support-for-the-kernel-module-name-tree.patch 0010-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch 0011-sof-hda-dsp-add-initial-kcontrol-values.patch 0012-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch 0013-bdw-rt5677-add-support-for-legacy-and-SOF-drivers.patch 0014-broadwell-rt286-add-SOF-support.patch 0015-sof-soundwire-initial-UCM2-version.patch 0016-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch 0017-sof-soundwire-rewrite-for-syntax-3.patch 0018-sof-hda-dsp-fix-the-device-order-Hdmi-devices.patch 0019-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch 0020-DAISY-I2S-move-to-Samsung-snow-snow.conf.patch 0021-DB410c-move-to-Qualcomm-apq8016-sbc.patch 0022-DB820c-DB845c-move-to-Qualcomm-tree.patch 0023-PAZ00-tegraalc5632-move-to-Tegra-alc5632-tree.patch 0024-VEYRON-I2C-move-to-Rockchip-max98090-tree.patch 0025-Pandaboard-ES-move-to-OMAP-abe-twl6040-tree.patch 0026-GoogleNyan-move-to-Tegra-max98090.patch 0027-SDP4430-Move-to-OMAP-abe-twl6040-SDP4430-tree.patch 0028-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch OBS-URL: https://build.opensuse.org/request/show/835804 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=17
130 lines
3.8 KiB
Diff
130 lines
3.8 KiB
Diff
From 1072c6d68e69ac432b411557237effa2dcc869cc Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 24 Jun 2020 11:15:42 +0200
|
|
Subject: [PATCH 16/51] sof-soundwire: cleanups recommended by the
|
|
ucm-validator
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/sof-soundwire/RT1308-1.conf | 1 -
|
|
ucm2/sof-soundwire/RT1308-2.conf | 1 -
|
|
ucm2/sof-soundwire/RT5682.conf | 4 +---
|
|
ucm2/sof-soundwire/RT700.conf | 7 ++-----
|
|
ucm2/sof-soundwire/RT711.conf | 4 +---
|
|
ucm2/sof-soundwire/RT715.conf | 1 -
|
|
6 files changed, 4 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/RT1308-1.conf
|
|
index da2eeaee0294..6da5b7e30a5f 100644
|
|
--- a/ucm2/sof-soundwire/RT1308-1.conf
|
|
+++ b/ucm2/sof-soundwire/RT1308-1.conf
|
|
@@ -18,6 +18,5 @@ SectionDevice."Speaker" {
|
|
Value {
|
|
PlaybackPriority 100
|
|
PlaybackPCM "hw:${CardId},2"
|
|
- PlaybackChannels "2"
|
|
}
|
|
}
|
|
diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/RT1308-2.conf
|
|
index 3484b7038b82..f88cb819d6a3 100644
|
|
--- a/ucm2/sof-soundwire/RT1308-2.conf
|
|
+++ b/ucm2/sof-soundwire/RT1308-2.conf
|
|
@@ -25,6 +25,5 @@ SectionDevice."Speaker" {
|
|
Value {
|
|
PlaybackPriority 100
|
|
PlaybackPCM "hw:${CardId},2"
|
|
- PlaybackChannels "2"
|
|
}
|
|
}
|
|
diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf
|
|
index 2a63bf2f610a..95a251dbe4fa 100644
|
|
--- a/ucm2/sof-soundwire/RT5682.conf
|
|
+++ b/ucm2/sof-soundwire/RT5682.conf
|
|
@@ -26,8 +26,7 @@ If.RT5682 {
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
JackControl "Headphone Jack"
|
|
}
|
|
}
|
|
@@ -54,7 +53,6 @@ If.RT5682 {
|
|
Value {
|
|
CapturePriority 200
|
|
CapturePCM "hw:${CardId},1"
|
|
- CaptureChannels "2"
|
|
JackControl "Headset Mic Jack"
|
|
}
|
|
}
|
|
diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf
|
|
index 9fe532c3c528..d2df46377710 100644
|
|
--- a/ucm2/sof-soundwire/RT700.conf
|
|
+++ b/ucm2/sof-soundwire/RT700.conf
|
|
@@ -25,8 +25,7 @@ If.RT700 {
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
JackControl "Headphone Jack"
|
|
}
|
|
}
|
|
@@ -48,8 +47,7 @@ If.RT700 {
|
|
|
|
Value {
|
|
PlaybackPriority 100
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
}
|
|
}
|
|
|
|
@@ -67,7 +65,6 @@ If.RT700 {
|
|
Value {
|
|
CapturePriority 200
|
|
CapturePCM "hw:${CardId},1"
|
|
- CaptureChannels "2"
|
|
JackControl "Headset Mic Jack"
|
|
}
|
|
}
|
|
diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf
|
|
index 11a504ab6916..12b48ed4b4a8 100644
|
|
--- a/ucm2/sof-soundwire/RT711.conf
|
|
+++ b/ucm2/sof-soundwire/RT711.conf
|
|
@@ -21,8 +21,7 @@ If.RT711 {
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
- PlaybackChannels "2"
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
JackControl "Headphone Jack"
|
|
}
|
|
}
|
|
@@ -41,7 +40,6 @@ If.RT711 {
|
|
Value {
|
|
CapturePriority 200
|
|
CapturePCM "hw:${CardId},1"
|
|
- CaptureChannels "2"
|
|
JackControl "Headset Mic Jack"
|
|
CaptureSwitch "PGA2.0 2 Master Capture Switch"
|
|
CaptureVolume "PGA2.0 2 Master Capture Volume"
|
|
diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf
|
|
index 2b8d89d3e0b5..d1734adc4fb5 100644
|
|
--- a/ucm2/sof-soundwire/RT715.conf
|
|
+++ b/ucm2/sof-soundwire/RT715.conf
|
|
@@ -22,7 +22,6 @@ If.RT715 {
|
|
Value {
|
|
CapturePriority 100
|
|
CapturePCM "hw:${CardId},4"
|
|
- CaptureChannels "2"
|
|
CaptureSwitch "PGA5.0 5 Master Capture Switch"
|
|
CaptureVolume "PGA5.0 5 Master Capture Volume"
|
|
}
|
|
--
|
|
2.16.4
|
|
|