Takashi Iwai
e8e74453bd
- Backport upstream fixes: UCM updates, Broadwell UCM support, namehint fixes, fix faulty assert in PCM plugins, etc: 0001-ucm-document-some-standard-values.patch 0002-conf-ucm-broadwell-rt286-add-ucm-config.patch 0003-conf-ucm-Add-Makefile.am-for-broadwell-rt286-ucm-con.patch 0004-ucm-reformat-snd_use_case_get-doc.patch 0005-ucm-improve-jack-configuration-documentation.patch 0006-USB-audio-Sound-Blaster-HD-iec958-is-on-device-1.patch 0007-Sync-include-sound-asound.h-with-4.1-kernel.patch 0008-conf-ucm-broadwell-rt286-change-to-use-the-correct-j.patch 0009-namehint-Fix-invalid-list-access-in-snd_device_name_.patch 0010-namehint-Fix-the-listing-without-device-number.patch 0011-namehint-Fix-bad-free-with-invalid-iface-name.patch 0012-Allow-hint-for-ctl-hwdep-timer-and-seq.patch 0013-conf-Add-hint-descriptions-to-ctl-hwdep-seq-and-time.patch 0014-conf-ucm-broadwell-rt286-change-to-set-capture-volum.patch 0015-ucm-allow-multiple-devices-in-JackHWMute.patch 0016-pcm-Remove-assert-from-snd_pcm_hw_params_slave.patch OBS-URL: https://build.opensuse.org/request/show/308371 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=181
169 lines
3.6 KiB
Diff
169 lines
3.6 KiB
Diff
From 3c263716fd5bd2d9d5308cb13dba667d138c0097 Mon Sep 17 00:00:00 2001
|
|
From: Bard Liao <bardliao@realtek.com>
|
|
Date: Thu, 5 Mar 2015 08:38:55 +0800
|
|
Subject: [PATCH 02/16] conf/ucm: broadwell-rt286: add ucm config
|
|
|
|
The configure should apply to all Broadwell-rt286 boards from Intel,
|
|
like Wilson Beach SDS Ultrabook.
|
|
|
|
Signed-off-by: Lu, Han <han.lu@intel.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/ucm/broadwell-rt286/HiFi | 128 ++++++++++++++++++++++
|
|
src/conf/ucm/broadwell-rt286/broadwell-rt286.conf | 8 ++
|
|
2 files changed, 136 insertions(+)
|
|
create mode 100644 src/conf/ucm/broadwell-rt286/HiFi
|
|
create mode 100644 src/conf/ucm/broadwell-rt286/broadwell-rt286.conf
|
|
|
|
diff --git a/src/conf/ucm/broadwell-rt286/HiFi b/src/conf/ucm/broadwell-rt286/HiFi
|
|
new file mode 100644
|
|
index 000000000000..08f5c50db405
|
|
--- /dev/null
|
|
+++ b/src/conf/ucm/broadwell-rt286/HiFi
|
|
@@ -0,0 +1,128 @@
|
|
+# Use case Configuration for Nexus 7
|
|
+# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com>
|
|
+
|
|
+SectionVerb {
|
|
+
|
|
+ EnableSequence [
|
|
+ ]
|
|
+
|
|
+ DisableSequence [
|
|
+ ]
|
|
+
|
|
+ # ALSA PCM
|
|
+ Value {
|
|
+ # ALSA PCM device for HiFi
|
|
+ PlaybackPCM "hw:broadwellrt286"
|
|
+ CapturePCM "hw:broadwellrt286"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Headphones" {
|
|
+ Comment "Headphones playback"
|
|
+
|
|
+ ConflictingDevice [
|
|
+ "Speaker"
|
|
+ ]
|
|
+
|
|
+ EnableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='Master Playback Volume' 30"
|
|
+ cset "name='HPO L Switch' on"
|
|
+ cset "name='HPO R Switch' on"
|
|
+ cset "name='Headphone Jack Switch' on"
|
|
+ cset "name='DAC0 Playback Volume' 100"
|
|
+ ]
|
|
+
|
|
+ DisableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='Headphone Jack Switch' off"
|
|
+ cset "name='HPO L Switch' off"
|
|
+ cset "name='HPO R Switch' off"
|
|
+ ]
|
|
+
|
|
+ Value {
|
|
+ PlaybackChannels "2"
|
|
+ JackDev "rt286-jack"
|
|
+ JackControl "Headset Jack"
|
|
+ JackHWMute "Speaker"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Speaker" {
|
|
+ Comment "Speaker playback"
|
|
+
|
|
+ ConflictingDevice [
|
|
+ "Headphones"
|
|
+ ]
|
|
+
|
|
+ EnableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='Master Playback Volume' 30"
|
|
+ cset "name='DAC0 Playback Volume' 127"
|
|
+ cset "name='SPO Switch' on"
|
|
+ cset "name='Speaker Playback Switch' on"
|
|
+ cset "name='Speaker Switch' on"
|
|
+ ]
|
|
+
|
|
+ DisableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='Speaker Switch' off"
|
|
+ cset "name='Speaker Playback Switch' off"
|
|
+ cset "name='SPO Switch' 0"
|
|
+ ]
|
|
+
|
|
+ Value {
|
|
+ PlaybackChannels "2"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Handset" {
|
|
+ Comment "Handset Microphone"
|
|
+
|
|
+ ConflictingDevice [
|
|
+ "Mainmic"
|
|
+ ]
|
|
+
|
|
+ EnableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+
|
|
+ cset "name='ADC 0 Mux' 0"
|
|
+ cset "name='ADC0 Capture Switch' on"
|
|
+ cset "name='ADC0 Capture Volume' 127"
|
|
+ cset "name='AMIC Volume' 1"
|
|
+ ]
|
|
+
|
|
+ DisableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='ADC0 Capture Switch' off"
|
|
+ ]
|
|
+
|
|
+ Value {
|
|
+ CaptureChannels "2"
|
|
+ }
|
|
+}
|
|
+
|
|
+SectionDevice."Mainmic" {
|
|
+ Comment "Main Microphone"
|
|
+
|
|
+ ConflictingDevice [
|
|
+ "Handset"
|
|
+ ]
|
|
+
|
|
+ EnableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+
|
|
+ cset "name='ADC 0 Mux' 2"
|
|
+ cset "name='ADC0 Capture Switch' on"
|
|
+ cset "name='ADC0 Capture Volume' 127"
|
|
+ ]
|
|
+
|
|
+ DisableSequence [
|
|
+ cdev "hw:broadwellrt286"
|
|
+ cset "name='ADC0 Capture Switch' off"
|
|
+ ]
|
|
+
|
|
+ Value {
|
|
+ CaptureChannels "2"
|
|
+ }
|
|
+}
|
|
diff --git a/src/conf/ucm/broadwell-rt286/broadwell-rt286.conf b/src/conf/ucm/broadwell-rt286/broadwell-rt286.conf
|
|
new file mode 100644
|
|
index 000000000000..4a176cd9a995
|
|
--- /dev/null
|
|
+++ b/src/conf/ucm/broadwell-rt286/broadwell-rt286.conf
|
|
@@ -0,0 +1,8 @@
|
|
+SectionUseCase."HiFi" {
|
|
+ File "HiFi"
|
|
+ Comment "Play HiFi quality Music"
|
|
+}
|
|
+
|
|
+SectionDefaults [
|
|
+ cdev "hw:broadwellrt286"
|
|
+]
|
|
--
|
|
2.4.1
|
|
|