Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-alsa-lib: Commit

external/alsa-lib


Commit MetaInfo

Révision7442c8b9be91ef576871eed5efce9499fcdeab4a (tree)
l'heure2019-01-29 22:33:17
AuteurSrinivas Kandagatla <srinivas.kandagatla@lina...>
CommiterTakashi Iwai

Message de Log

ucm: Add ucm files for DB820c board

DB820c board is based of MSM8996 Qualcomm SoC, which has support for both
Digital and Analog audio. Digital audio is over HDMI and analog is over
WCD9335 codec via SLIMbus.

Board itself has HDMI port, a 3.5mm audio Jack and an Audio expansion
connector.
This patch adds support for HDMI port and 3.5mm jack.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Change Summary

Modification

--- a/configure.ac
+++ b/configure.ac
@@ -747,6 +747,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
747747 src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/Makefile \
748748 src/conf/ucm/DAISY-I2S/Makefile \
749749 src/conf/ucm/DB410c/Makefile \
750+ src/conf/ucm/DB820c/Makefile \
750751 src/conf/ucm/Dell-WD15-Dock/Makefile \
751752 src/conf/ucm/GoogleNyan/Makefile \
752753 src/conf/ucm/gpd-win-pocket-rt5645/Makefile \
--- /dev/null
+++ b/src/conf/ucm/DB820c/DB820c.conf
@@ -0,0 +1,9 @@
1+SectionUseCase."HiFi" {
2+ File "HiFi"
3+ Comment "HiFi quality Music."
4+}
5+
6+SectionUseCase."HDMI" {
7+ File "HDMI"
8+ Comment "HDMI output."
9+}
--- /dev/null
+++ b/src/conf/ucm/DB820c/HDMI
@@ -0,0 +1,37 @@
1+# Use case configuration for DB820c board.
2+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
3+
4+SectionVerb {
5+ EnableSequence [
6+ cdev "hw:0"
7+ cset "name='HDMI Mixer MultiMedia1' 1"
8+ ]
9+
10+ DisableSequence [
11+ cdev "hw:0"
12+ cset "name='HDMI Mixer MultiMedia1' 0"
13+ ]
14+ Value {
15+ TQ "HiFi"
16+ PlaybackPCM "plughw:0,0"
17+ }
18+}
19+
20+SectionDevice."HDMI-stereo" {
21+ #Name "HDMI-stereo"
22+ Comment "HDMI Digital Stereo Output"
23+
24+ EnableSequence [
25+ cdev "hw:0"
26+ cset "name='HDMI Mixer MultiMedia1' 1"
27+ ]
28+
29+ DisableSequence [
30+ cdev "hw:0"
31+ cset "name='HDMI Mixer MultiMedia1' 0"
32+ ]
33+
34+ Value {
35+ PlaybackChannels "2"
36+ }
37+}
--- /dev/null
+++ b/src/conf/ucm/DB820c/HiFi
@@ -0,0 +1,110 @@
1+# Use case configuration for DB820c board.
2+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
3+
4+SectionVerb {
5+
6+ EnableSequence [
7+ cdev "hw:0"
8+ cset "name='SLIM RX0 MUX' ZERO"
9+ cset "name='SLIM RX1 MUX' ZERO"
10+ cset "name='SLIM RX2 MUX' ZERO"
11+ cset "name='SLIM RX3 MUX' ZERO"
12+ cset "name='SLIM RX4 MUX' ZERO"
13+ cset "name='SLIM RX5 MUX' AIF4_PB"
14+ cset "name='SLIM RX6 MUX' AIF4_PB"
15+ cset "name='SLIM RX7 MUX' ZERO"
16+ cset "name='RX INT1_2 MUX' RX5"
17+ cset "name='RX INT2_2 MUX' RX6"
18+ ## gain to 0dB
19+ cset "name='RX5 Digital Volume' 68"
20+ ## gain to 0dB
21+ cset "name='RX6 Digital Volume' 68"
22+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
23+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
24+ cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
25+ cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
26+ cset "name='AIF1_CAP Mixer SLIM TX0' 1"
27+ cset "name='SLIM TX0 MUX' DEC0"
28+ cset "name='ADC2 Volume' 12"
29+ cset "name='ADC MUX0' AMIC"
30+ cset "name='AMIC MUX0' ADC2"
31+ ]
32+
33+ DisableSequence [
34+ cdev "hw:0"
35+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
36+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
37+ ]
38+
39+ # ALSA PCM
40+ Value {
41+ # ALSA PCM device for HiFi
42+ PlaybackPCM "plughw:0,1"
43+ CapturePCM "plughw:0,2"
44+ }
45+}
46+
47+SectionDevice."Headphones" {
48+ Comment "Headphones playback"
49+
50+ EnableSequence [
51+ cdev "hw:0"
52+ cset "name='SLIM RX0 MUX' ZERO"
53+ cset "name='SLIM RX1 MUX' ZERO"
54+ cset "name='SLIM RX2 MUX' ZERO"
55+ cset "name='SLIM RX3 MUX' ZERO"
56+ cset "name='SLIM RX4 MUX' ZERO"
57+ cset "name='SLIM RX5 MUX' AIF4_PB"
58+ cset "name='SLIM RX6 MUX' AIF4_PB"
59+ cset "name='SLIM RX7 MUX' ZERO"
60+ cset "name='RX INT1_2 MUX' RX5"
61+ cset "name='RX INT2_2 MUX' RX6"
62+ ## gain to 0dB
63+ cset "name='RX5 Digital Volume' 68"
64+ ## gain to 0dB
65+ cset "name='RX6 Digital Volume' 68"
66+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
67+ cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
68+ cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
69+ ]
70+
71+ DisableSequence [
72+ cdev "hw:0"
73+ cset "name='RX5 Digital Volume' 0"
74+ cset "name='RX6 Digital Volume' 0"
75+ cset "name='SLIM RX5 MUX' ZERO"
76+ cset "name='SLIM RX6 MUX' ZERO"
77+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
78+ ]
79+
80+ Value {
81+ PlaybackChannels "2"
82+ }
83+}
84+
85+SectionDevice."Handset" {
86+ Comment "Headset Microphone"
87+
88+ EnableSequence [
89+ cdev "hw:0"
90+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
91+ cset "name='AIF1_CAP Mixer SLIM TX0' 1"
92+ cset "name='SLIM TX0 MUX' DEC0"
93+ cset "name='ADC2 Volume' 12"
94+ cset "name='ADC MUX0' AMIC"
95+ cset "name='AMIC MUX0' ADC2"
96+ ]
97+
98+ DisableSequence [
99+ cdev "hw:0"
100+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
101+ cset "name='AIF1_CAP Mixer SLIM TX0' 0"
102+ cset "name='AMIC MUX0' ZERO"
103+ cset "name='SLIM TX0 MUX' ZERO"
104+ cset "name='ADC2 Volume' 0"
105+ ]
106+
107+ Value {
108+ CaptureChannels "1"
109+ }
110+}
--- /dev/null
+++ b/src/conf/ucm/DB820c/Makefile.am
@@ -0,0 +1,4 @@
1+alsaconfigdir = @ALSA_CONFIG_DIR@
2+ucmdir = $(alsaconfigdir)/ucm/DB820c
3+ucm_DATA = DB820c.conf HDMI HiFi
4+EXTRA_DIST = $(ucm_DATA)
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -31,6 +31,7 @@ chtrt5650 \
3131 cube-i1_TF-Defaultstring-CherryTrailCR \
3232 DAISY-I2S \
3333 DB410c \
34+DB820c \
3435 Dell-WD15-Dock \
3536 GoogleNyan \
3637 gpd-win-pocket-rt5645 \
Afficher sur ancien navigateur de dépôt.