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
112 lines
2.7 KiB
Diff
112 lines
2.7 KiB
Diff
From 42d0227c417e732ac76328e4168d885b07211f92 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 24 Jan 2020 10:15:58 +0100
|
|
Subject: [PATCH 15/36] Dell-WD15-Dock: cleaups and corrections
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf | 6 ------
|
|
ucm2/Dell-WD15-Dock/HiFi.conf | 26 --------------------------
|
|
ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf | 29 +++++++++++++++++++++++++++++
|
|
ucm2/USB-Audio/Dell-WD15-Dock.conf | 6 ++++++
|
|
4 files changed, 35 insertions(+), 32 deletions(-)
|
|
delete mode 100644 ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf
|
|
delete mode 100644 ucm2/Dell-WD15-Dock/HiFi.conf
|
|
create mode 100644 ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
|
|
create mode 100644 ucm2/USB-Audio/Dell-WD15-Dock.conf
|
|
|
|
diff --git a/ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf b/ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf
|
|
deleted file mode 100644
|
|
index 7b96a54249bc..000000000000
|
|
--- a/ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf
|
|
+++ /dev/null
|
|
@@ -1,6 +0,0 @@
|
|
-Syntax 2
|
|
-Comment "USB-audio on Dell WD15 docking station"
|
|
-SectionUseCase."HiFi" {
|
|
- File "HiFi.conf"
|
|
- Comment "Default"
|
|
-}
|
|
diff --git a/ucm2/Dell-WD15-Dock/HiFi.conf b/ucm2/Dell-WD15-Dock/HiFi.conf
|
|
deleted file mode 100644
|
|
index 3b02f81dafc5..000000000000
|
|
--- a/ucm2/Dell-WD15-Dock/HiFi.conf
|
|
+++ /dev/null
|
|
@@ -1,26 +0,0 @@
|
|
-SectionDevice."Headphones" {
|
|
- Comment "Headphones"
|
|
-
|
|
- Value {
|
|
- PlaybackChannels "2"
|
|
- PlaybackPCM "hw:${CardId},0"
|
|
- }
|
|
-}
|
|
-
|
|
-SectionDevice."LineOut" {
|
|
- Comment "Line Out"
|
|
-
|
|
- Value {
|
|
- PlaybackChannels "2"
|
|
- PlaybackPCM "hw:${CardId},1"
|
|
- }
|
|
-}
|
|
-
|
|
-SectionDevice."Mic" {
|
|
- Comment "Microphone"
|
|
-
|
|
- Value {
|
|
- CaptureChannels "2"
|
|
- CapturePCM "hw:${CardId},0"
|
|
- }
|
|
-}
|
|
diff --git a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
|
|
new file mode 100644
|
|
index 000000000000..37b7e0d11b82
|
|
--- /dev/null
|
|
+++ b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
|
|
@@ -0,0 +1,29 @@
|
|
+SectionDevice."Headphones" {
|
|
+ Comment "Headphones"
|
|
+
|
|
+ Value {
|
|
+ PlaybackPriority 100
|
|
+ PlaybackChannels 2
|
|
+ PlaybackPCM "hw:${CardId}"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Line" {
|
|
+ Comment "Line Out"
|
|
+
|
|
+ Value {
|
|
+ PlaybackPriority 200
|
|
+ PlaybackChannels 2
|
|
+ PlaybackPCM "hw:${CardId},1"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Mic" {
|
|
+ Comment "Microphone"
|
|
+
|
|
+ Value {
|
|
+ CapturePriority 100
|
|
+ CaptureChannels 2
|
|
+ CapturePCM "hw:${CardId}"
|
|
+ }
|
|
+}
|
|
diff --git a/ucm2/USB-Audio/Dell-WD15-Dock.conf b/ucm2/USB-Audio/Dell-WD15-Dock.conf
|
|
new file mode 100644
|
|
index 000000000000..1fbac9e5c1bd
|
|
--- /dev/null
|
|
+++ b/ucm2/USB-Audio/Dell-WD15-Dock.conf
|
|
@@ -0,0 +1,6 @@
|
|
+Syntax 2
|
|
+Comment "USB-audio on Dell WD15 docking station"
|
|
+SectionUseCase."HiFi" {
|
|
+ File "Dell-WD15-Dock-HiFi.conf"
|
|
+ Comment "Default"
|
|
+}
|
|
--
|
|
2.16.4
|
|
|