aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch
blob: c19ce27483b2e5e789d59c5d0eda392d90d8bad2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
From 2b92828b0e8ff30cfe7cbd12db6e96c3860333d7 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Fri, 20 Sep 2019 13:12:05 +0100
Subject: [PATCH 5/9] WIP: make card name explicit

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 src/conf/ucm/DB845c/DB845c.conf |   2 +-
 src/conf/ucm/DB845c/HDMI        |  10 +--
 src/conf/ucm/DB845c/HiFi        | 124 ++------------------------------
 3 files changed, 12 insertions(+), 124 deletions(-)

diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf
index c4f958e0..d3cf0b7d 100644
--- a/src/conf/ucm/DB845c/DB845c.conf
+++ b/src/conf/ucm/DB845c/DB845c.conf
@@ -9,7 +9,7 @@ SectionUseCase."HDMI" {
 }
 
 SectionDefaults [
-	cdev "hw:0"
+	cdev "hw:DB845c"
 	cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
 	cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1"
 	cset "name='SLIM RX0 MUX' AIF1_PB"
diff --git a/src/conf/ucm/DB845c/HDMI b/src/conf/ucm/DB845c/HDMI
index 8354033d..435e6d82 100644
--- a/src/conf/ucm/DB845c/HDMI
+++ b/src/conf/ucm/DB845c/HDMI
@@ -3,17 +3,17 @@
 
 SectionVerb {
         EnableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
         ]
 
         DisableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0"
 	]
        Value {
                 TQ "HiFi"
-                PlaybackPCM "hw:0,0"
+                PlaybackPCM "hw:DB845c,0"
         }
 }
 
@@ -22,12 +22,12 @@ SectionDevice."HDMI-stereo" {
         Comment "HDMI Digital Stereo Output"
 
         EnableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
         ]
 
         DisableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0"
         ]
 
diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi
index e8ede5b3..f83213c8 100644
--- a/src/conf/ucm/DB845c/HiFi
+++ b/src/conf/ucm/DB845c/HiFi
@@ -4,7 +4,7 @@
 SectionVerb {
 
 	EnableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='SLIM RX0 MUX' AIF1_PB"
 		cset "name='CDC_IF RX0 MUX' SLIM RX0"
 		cset "name='RX INT7_1 MIX1 INP0' RX0"
@@ -21,7 +21,7 @@ SectionVerb {
 	]
 
 	DisableSequence [
-                cdev "hw:0"
+                cdev "hw:DB845c"
 		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0"
 		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
 	]
@@ -29,8 +29,8 @@ SectionVerb {
 	# ALSA PCM
 	Value {
 		# ALSA PCM device for HiFi
-		PlaybackPCM "hw:0,1"
-		CapturePCM "hw:0,2"
+		PlaybackPCM "hw:DB845c,1"
+		CapturePCM "hw:DB845c,2"
 	}
 }
 
@@ -38,7 +38,7 @@ SectionDevice."Speakers" {
 	Comment "Speakers playback"
 
 	EnableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='SLIM RX0 MUX' AIF1_PB"
 		cset "name='CDC_IF RX0 MUX' SLIM RX0"
 		cset "name='RX INT7_1 MIX1 INP0' RX0"
@@ -58,7 +58,7 @@ SectionDevice."Speakers" {
 	]
 
 	DisableSequence [
-		cdev "hw:0"
+		cdev "hw:DB845c"
 		cset "name='RX0 Digital Volume' 0"
 		cset "name='SLIM RX0 MUX' ZERO"
 		cset "name='COMP7 Switch' 0"
@@ -76,115 +76,3 @@ SectionDevice."Speakers" {
 		PlaybackChannels "2"
 	}
 }
-
-SectionDevice."DMIC0" {
-	Comment "Digital Microphone0"
-
-	EnableSequence [
-		cdev "hw:0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='CDC_IF TX0 MUX' DEC0"
-		cset "name='ADC MUX0' DMIC"
-		cset "name='DMIC MUX0' DMIC0"
-		cset "name='DEC0 Volume' 68"
-	]
-
-	DisableSequence [
-		cdev "hw:0"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-		cset "name='CDC_IF TX0 MUX' ZERO"
-		cset "name='ADC MUX0' ZERO"
-		cset "name='DMIC MUX0' ZERO"
-		cset "name='DEC0 Volume' 0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-	]
-
-	Value {
-		CaptureChannels "1"
-	}
-}
-
-SectionDevice."DMIC1" {
-	Comment "Digital Microphone1"
-
-	EnableSequence [
-		cdev "hw:0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='CDC_IF TX0 MUX' DEC0"
-		cset "name='ADC MUX0' DMIC"
-		cset "name='DMIC MUX0' DMIC1"
-		cset "name='DEC0 Volume' 68"
-	]
-
-	DisableSequence [
-		cdev "hw:0"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-		cset "name='CDC_IF TX0 MUX' ZERO"
-		cset "name='ADC MUX0' ZERO"
-		cset "name='DMIC MUX0' ZERO"
-		cset "name='DEC0 Volume' 0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-	]
-
-	Value {
-		CaptureChannels "1"
-	}
-}
-
-SectionDevice."DMIC2" {
-	Comment "Digital Microphone0"
-
-	EnableSequence [
-		cdev "hw:0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='CDC_IF TX0 MUX' DEC0"
-		cset "name='ADC MUX0' DMIC"
-		cset "name='DMIC MUX0' DMIC2"
-		cset "name='DEC0 Volume' 68"
-	]
-
-	DisableSequence [
-		cdev "hw:0"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-		cset "name='CDC_IF TX0 MUX' ZERO"
-		cset "name='ADC MUX0' ZERO"
-		cset "name='DMIC MUX0' ZERO"
-		cset "name='DEC0 Volume' 0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-	]
-
-	Value {
-		CaptureChannels "1"
-	}
-}
-
-SectionDevice."DMIC4" {
-	Comment "Digital Microphone0"
-
-	EnableSequence [
-		cdev "hw:0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='CDC_IF TX0 MUX' DEC0"
-		cset "name='ADC MUX0' DMIC"
-		cset "name='DMIC MUX0' DMIC3"
-		cset "name='DEC0 Volume' 68"
-	]
-
-	DisableSequence [
-		cdev "hw:0"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-		cset "name='CDC_IF TX0 MUX' ZERO"
-		cset "name='ADC MUX0' ZERO"
-		cset "name='DMIC MUX0' ZERO"
-		cset "name='DEC0 Volume' 0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-	]
-
-	Value {
-		CaptureChannels "1"
-	}
-}
-- 
2.23.0