~ubuntu-branches/ubuntu/saucy/alsa-lib/saucy-proposed
» Revision
109
: debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch
« back to all changes in this revision
Viewing changes to debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch
- browse files at revision 109
- compare with another revision
- download diff
- download tarball
- view history from revision 109
- Committer: Package Import Robot
- Author(s): David Henningsson
- Date: 2013-08-27 09:46:37 UTC
- Revision ID: package-import@ubuntu.com-20130827094637-idvn4hg6bc1whbur
Tags: 1.0.27.2-1ubuntu2
Add UCM config files for Nexus 4 (Mako) and Galaxy Nexus (Maguro)
- files added:
- .pc/0001-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch
- .pc/0001-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch/src
- .pc/0001-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch/src/conf
- .pc/0001-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch/src/conf/ucm
- .pc/0001-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch/src/conf/ucm/Tuna
- .pc/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch
- .pc/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch/src
- .pc/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch/src/conf
- .pc/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch/src/conf/ucm
- .pc/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch/src/conf/ucm/apq8064-tabla-snd-card
- src/conf/ucm/Tuna
- src/conf/ucm/apq8064-tabla-snd-card
- files modified:
- .pc/applied-patches
added
removed
debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch
1
From b1d218e57b4edfed605ba9c425b0cad1a4c7c784 Mon Sep 17 00:00:00 2001
2
From: David Henningsson <david.henningsson@canonical.com>
3
Date: Tue, 27 Aug 2013 07:04:37 +0200
4
Subject: [PATCH] Add UCM configuration for Nexus 4 (Mako)
5
6
The VoiceCall profile is mostly empty, because in my implementation,
7
this is handled by talking to the audio HAL.
8
---
9
configure.in | 1 +
10
src/conf/ucm/Makefile.am | 2 +-
11
src/conf/ucm/apq8064-tabla-snd-card/HiFi | 273 ++++++++++++++++++++
12
src/conf/ucm/apq8064-tabla-snd-card/Makefile.am | 4 +
13
src/conf/ucm/apq8064-tabla-snd-card/VoiceCall | 137 ++++++++++
14
.../apq8064-tabla-snd-card.conf | 8 +
15
6 files changed, 424 insertions(+), 1 deletion(-)
16
create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/HiFi
17
create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/Makefile.am
18
create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/VoiceCall
19
create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf
20
21
diff --git a/configure.in b/configure.in
22
index 00fff2b..25fdc81 100644
23
--- a/configure.in
24
+++ b/configure.in
25
@@ -669,6 +669,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
26
src/conf/ucm/PandaBoardES/Makefile \
27
src/conf/ucm/SDP4430/Makefile \
28
src/conf/ucm/tegraalc5632/Makefile \
29
+ src/conf/ucm/apq8064-tabla-snd-card/Makefile \
30
modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
31
alsalisp/Makefile aserver/Makefile \
32
test/Makefile test/lsb/Makefile \
33
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
34
index e089dde..adb3c87 100644
35
--- a/src/conf/ucm/Makefile.am
36
+++ b/src/conf/ucm/Makefile.am
37
@@ -1 +1 @@
38
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632
39
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card
40
diff --git a/src/conf/ucm/apq8064-tabla-snd-card/HiFi b/src/conf/ucm/apq8064-tabla-snd-card/HiFi
41
new file mode 100644
42
index 0000000..6c590e3
43
--- /dev/null
44
+++ b/src/conf/ucm/apq8064-tabla-snd-card/HiFi
45
@@ -0,0 +1,273 @@
46
+SectionVerb {
47
+ EnableSequence [
48
+ cdev "hw:apq8064tablasnd"
49
+
50
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
51
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
52
+ ]
53
+
54
+ DisableSequence [
55
+ cdev "hw:apq8064tablasnd"
56
+
57
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
58
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
59
+ ]
60
+
61
+ Value {
62
+ TQ "HiFi"
63
+
64
+ CapturePCM "hw:apq8064tablasnd,0"
65
+ PlaybackPCM "hw:apq8064tablasnd,0"
66
+ }
67
+}
68
+
69
+SectionDevice."Earpiece" {
70
+ #Name "Earpiece"
71
+ Comment "Handset Rx device"
72
+
73
+ # FIXME
74
+ ConflictingDevice [
75
+ "Headphones"
76
+ ]
77
+
78
+ EnableSequence [
79
+ cdev "hw:apq8064tablasnd"
80
+
81
+ # We need to disable this while setting up the route, else the
82
+ # driver will hang if the stream is open.
83
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
84
+
85
+ cset "name='SLIM_0_RX Channels' One"
86
+ cset "name='RX1 MIX1 INP1' RX1"
87
+ cset "name='RX1 MIX1 INP2' RX1"
88
+ cset "name='RX1 Digital Volume' 68"
89
+ cset "name='EAR PA Gain' POS_6_DB"
90
+ cset "name='DAC1 Switch' 1"
91
+ cset "name='SLIM TX3 MUX' RMIX1"
92
+
93
+ # Route has been set up, re-enable the mixer.
94
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
95
+ ]
96
+
97
+ DisableSequence [
98
+ cdev "hw:apq8064tablasnd"
99
+
100
+ # See comment in EnableSequence
101
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
102
+
103
+ cset "name='RX1 MIX1 INP1' ZERO"
104
+ cset "name='RX1 MIX1 INP2' ZERO"
105
+ cset "name='RX1 Digital Volume' 68"
106
+ cset "name='DAC1 Switch' 0"
107
+ cset "name='SLIM TX3 MUX' ZERO"
108
+
109
+ # See comment in EnableSequence
110
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
111
+ ]
112
+
113
+ #ACDBID 7:1
114
+ #EffectsMixerCTL "SRS TruMedia"
115
+
116
+ Value {
117
+ PlaybackChannels "2"
118
+ }
119
+}
120
+
121
+SectionDevice."Speaker" {
122
+ #Name "Speaker"
123
+ Comment "Speaker Rx device"
124
+
125
+ # FIXME
126
+ ConflictingDevice [
127
+ "Earpiece"
128
+ ]
129
+
130
+ EnableSequence [
131
+ cdev "hw:apq8064tablasnd"
132
+
133
+ # We need to disable this while setting up the route, else the
134
+ # driver will hang if the stream is open.
135
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
136
+
137
+ cset "name='SLIM_0_RX Channels' One"
138
+ cset "name='RX3 MIX1 INP1' RX1"
139
+ cset "name='RX3 MIX1 INP2' RX6"
140
+ cset "name='RX4 DSM MUX' DSM_INV"
141
+ cset "name='RX3 Digital Volume' 68"
142
+ cset "name='LINEOUT1 Volume' 100"
143
+ cset "name='LINEOUT3 Volume' 100"
144
+ cset "name='SLIM TX3 MUX' RMIX3"
145
+
146
+ # Route has been set up, re-enable the mixer.
147
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
148
+ ]
149
+
150
+ DisableSequence [
151
+ cdev "hw:apq8064tablasnd"
152
+
153
+ # See comment in EnableSequence
154
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
155
+
156
+ cset "name='RX3 MIX1 INP1' ZERO"
157
+ cset "name='RX3 MIX1 INP2' ZERO"
158
+ cset "name='RX4 DSM MUX' CIC_OUT"
159
+ cset "name='RX3 Digital Volume' 68"
160
+ cset "name='LINEOUT1 Volume' 0"
161
+ cset "name='LINEOUT3 Volume' 0"
162
+ cset "name='SLIM TX3 MUX' ZERO"
163
+
164
+ # See comment in EnableSequence
165
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
166
+ ]
167
+
168
+ #ACDBID 14:1
169
+ #EffectsMixerCTL "SRS TruMedia"
170
+
171
+ Value {
172
+ PlaybackChannels "2"
173
+ }
174
+}
175
+
176
+SectionDevice."Headphones" {
177
+ #Name "Headphones"
178
+ Comment "Headset Rx device"
179
+
180
+ # FIXME
181
+ ConflictingDevice [
182
+ "Earpiece"
183
+ ]
184
+
185
+ EnableSequence [
186
+ cdev "hw:apq8064tablasnd"
187
+
188
+ # We need to disable this while setting up the route, else the
189
+ # driver will hang if the stream is open.
190
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
191
+
192
+ cset "name='SLIM_0_RX Channels' Two"
193
+ cset "name='RX1 MIX1 INP1' RX1"
194
+ cset "name='RX1 MIX1 INP2' RX6"
195
+ cset "name='RX2 MIX1 INP1' RX2"
196
+ cset "name='RX2 MIX1 INP2' RX7"
197
+ cset "name='HPHL DAC Switch' 1"
198
+ #FIXME ENOEXIST: cset "name='HPHR DAC Switch' 1"
199
+ cset "name='RX1 Digital Volume' 68"
200
+ cset "name='RX2 Digital Volume' 68"
201
+ cset "name='HPHL Volume' 50"
202
+ cset "name='HPHR Volume' 50"
203
+ cset "name='SLIM TX3 MUX' RMIX1"
204
+ cset "name='SLIM TX5 MUX' RMIX2"
205
+
206
+ # Route has been set up, re-enable the mixer.
207
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
208
+ ]
209
+
210
+ DisableSequence [
211
+ cdev "hw:apq8064tablasnd"
212
+
213
+ # See comment in EnableSequence
214
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
215
+
216
+ cset "name='RX1 MIX1 INP1' ZERO"
217
+ cset "name='RX1 MIX1 INP2' ZERO"
218
+ cset "name='RX2 MIX1 INP1' ZERO"
219
+ cset "name='RX2 MIX1 INP2' ZERO"
220
+ cset "name='HPHL DAC Switch' 0"
221
+ #FIXME ENOEXIST: cset "name='HPHR DAC Switch' 0"
222
+ cset "name='RX1 Digital Volume' 68"
223
+ cset "name='RX2 Digital Volume' 68"
224
+ cset "name='HPHL Volume' 0"
225
+ cset "name='HPHR Volume' 0"
226
+ cset "name='SLIM TX3 MUX' ZERO"
227
+ cset "name='SLIM TX5 MUX' ZERO"
228
+
229
+ # See comment in EnableSequence
230
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
231
+ ]
232
+
233
+ #ACDBID 10:1
234
+ #EffectsMixerCTL "SRS TruMedia"
235
+
236
+ Value {
237
+ PlaybackChannels "2"
238
+ }
239
+}
240
+
241
+SectionDevice."Headset" {
242
+ #Name "Headset"
243
+ Comment "Headset Microphone"
244
+
245
+ # FIXME
246
+ ConflictingDevice [
247
+ "Handset"
248
+ ]
249
+
250
+ EnableSequence [
251
+ cdev "hw:apq8064tablasnd"
252
+
253
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
254
+ cset "name='SLIM_0_TX Channels' One"
255
+ cset "name='SLIM TX7 MUX' DEC8"
256
+ cset "name='DEC8 MUX' ADC2"
257
+ cset "name='ADC2 Volume' 3"
258
+ cset "name='DEC8 Volume' 84"
259
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
260
+ ]
261
+
262
+ DisableSequence [
263
+ cdev "hw:apq8064tablasnd"
264
+
265
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
266
+ cset "name='SLIM TX7 MUX' ZERO"
267
+ cset "name='DEC8 MUX' ZERO"
268
+ cset "name='ADC2 Volume' 0"
269
+ ]
270
+
271
+ #ACDBID 8:2
272
+ #EffectsMixerCTL "SRS TruMedia"
273
+
274
+ Value {
275
+ CaptureChannels "1"
276
+ }
277
+}
278
+
279
+SectionDevice."Handset" {
280
+ #Name "Handset"
281
+ Comment "Handset Microphone"
282
+
283
+ # FIXME
284
+ ConflictingDevice [
285
+ "Headset"
286
+ ]
287
+
288
+ EnableSequence [
289
+ cdev "hw:apq8064tablasnd"
290
+
291
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
292
+ cset "name='SLIM_0_TX Channels' One"
293
+ cset "name='SLIM TX7 MUX' DEC7"
294
+ cset "name='DEC7 MUX' ADC1"
295
+ cset "name='DEC7 Volume' 80"
296
+ cset "name='ADC1 Volume' 100"
297
+ cset "name='MICBIAS1 CAPLESS Switch' 0"
298
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1"
299
+ ]
300
+
301
+ DisableSequence [
302
+ cdev "hw:apq8064tablasnd"
303
+
304
+ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0"
305
+ cset "name='SLIM TX7 MUX' ZERO"
306
+ cset "name='DEC7 MUX' ZERO"
307
+ cset "name='DEC7 Volume' 0"
308
+ cset "name='ADC1 Volume' 0"
309
+ cset "name='MICBIAS1 CAPLESS Switch' 1"
310
+ ]
311
+
312
+ #ACDBID 4:2
313
+ #EffectsMixerCTL "SRS TruMedia"
314
+
315
+ Value {
316
+ CaptureChannels "1"
317
+ }
318
+}
319
diff --git a/src/conf/ucm/apq8064-tabla-snd-card/Makefile.am b/src/conf/ucm/apq8064-tabla-snd-card/Makefile.am
320
new file mode 100644
321
index 0000000..71309db
322
--- /dev/null
323
+++ b/src/conf/ucm/apq8064-tabla-snd-card/Makefile.am
324
@@ -0,0 +1,4 @@
325
+alsaconfigdir = @ALSA_CONFIG_DIR@
326
+ucmdir = $(alsaconfigdir)/ucm/apq8064-tabla-snd-card
327
+ucm_DATA = apq8064-tabla-snd-card.conf HiFi VoiceCall
328
+EXTRA_DIST = $(ucm_DATA)
329
diff --git a/src/conf/ucm/apq8064-tabla-snd-card/VoiceCall b/src/conf/ucm/apq8064-tabla-snd-card/VoiceCall
330
new file mode 100644
331
index 0000000..b96e4a1
332
--- /dev/null
333
+++ b/src/conf/ucm/apq8064-tabla-snd-card/VoiceCall
334
@@ -0,0 +1,137 @@
335
+# There is no mixer setup here - it is handled by PulseAudio's audio HAL module.
336
+
337
+SectionVerb {
338
+ EnableSequence [
339
+ cdev "hw:apq8064tablasnd"
340
+ cset "name='MultiMedia1 Mixer SLIM_4_TX' 1"
341
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1"
342
+ ]
343
+
344
+ DisableSequence [
345
+ cdev "hw:apq8064tablasnd"
346
+ cset "name='MultiMedia1 Mixer SLIM_4_TX' 0"
347
+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0"
348
+ ]
349
+
350
+ Value {
351
+ CapturePCM "hw:apq8064tablasnd,0"
352
+ PlaybackPCM "hw:apq8064tablasnd,0"
353
+ }
354
+}
355
+
356
+SectionDevice."Earpiece" {
357
+ #Name "Earpiece"
358
+ Comment "Handset Rx device"
359
+
360
+ # FIXME
361
+ ConflictingDevice [
362
+ "Headphones"
363
+ "Speaker"
364
+ ]
365
+
366
+ EnableSequence [
367
+ ]
368
+
369
+ DisableSequence [
370
+ ]
371
+
372
+ #ACDBID 7:1
373
+ #EffectsMixerCTL "SRS TruMedia"
374
+
375
+ Value {
376
+ PlaybackChannels "2"
377
+ }
378
+}
379
+
380
+SectionDevice."Speaker" {
381
+ #Name "Speaker"
382
+ Comment "Speaker Rx device"
383
+
384
+ # FIXME
385
+ ConflictingDevice [
386
+ "Earpiece"
387
+ "Headphones"
388
+ ]
389
+
390
+ EnableSequence [
391
+ ]
392
+
393
+ DisableSequence [
394
+ ]
395
+
396
+ #ACDBID 14:1
397
+ #EffectsMixerCTL "SRS TruMedia"
398
+
399
+ Value {
400
+ PlaybackChannels "2"
401
+ }
402
+}
403
+
404
+SectionDevice."Headphones" {
405
+ #Name "Headphones"
406
+ Comment "Headset Rx device"
407
+
408
+ # FIXME
409
+ ConflictingDevice [
410
+ "Earpiece"
411
+ "Speaker"
412
+ ]
413
+
414
+ EnableSequence [
415
+ ]
416
+
417
+ DisableSequence [
418
+ ]
419
+
420
+ #ACDBID 10:1
421
+ #EffectsMixerCTL "SRS TruMedia"
422
+
423
+ Value {
424
+ PlaybackChannels "2"
425
+ }
426
+}
427
+
428
+SectionDevice."Headset" {
429
+ #Name "Headset"
430
+ Comment "Headset Microphone"
431
+
432
+ # FIXME
433
+ ConflictingDevice [
434
+ "Handset"
435
+ ]
436
+
437
+ EnableSequence [
438
+ ]
439
+
440
+ DisableSequence [
441
+ ]
442
+
443
+ #ACDBID 8:2
444
+ #EffectsMixerCTL "SRS TruMedia"
445
+
446
+ Value {
447
+ CaptureChannels "1"
448
+ }
449
+}
450
+
451
+SectionDevice."Handset" {
452
+ #Name "Handset"
453
+ Comment "Handset Microphone"
454
+
455
+ ConflictingDevice [
456
+ "Headset"
457
+ ]
458
+
459
+ EnableSequence [
460
+ ]
461
+
462
+ DisableSequence [
463
+ ]
464
+
465
+ #ACDBID 4:2
466
+ #EffectsMixerCTL "SRS TruMedia"
467
+
468
+ Value {
469
+ CaptureChannels "1"
470
+ }
471
+}
472
diff --git a/src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf b/src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf
473
new file mode 100644
474
index 0000000..a4a7c1c
475
--- /dev/null
476
+++ b/src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf
477
@@ -0,0 +1,8 @@
478
+SectionUseCase."HiFi" {
479
+ File "HiFi"
480
+ Comment "Play HiFi quality Music."
481
+}
482
+SectionUseCase."Voice Call" {
483
+ File "VoiceCall"
484
+ Comment "Make a phone call"
485
+}
486
--
487
1.7.9.5
488
Loggerhead is a web-based interface for Breezy
Version: 2.0.1