Package: alsa-lib / 1.0.28-1

0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch Patch series | download
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
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
From 68f94a1fa946e8a3035a7c2cc6c62058fd9b8070 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Tue, 27 Aug 2013 09:43:31 +0200
Subject: [PATCH 2/4] Add UCM config file for Galaxy Nexus (maguro)

---
 configure.ac                  |    1 +
 src/conf/ucm/Makefile.am      |    2 +-
 src/conf/ucm/Tuna/HiFi        |  354 +++++++++++++++++++++++++++++++++++++++++
 src/conf/ucm/Tuna/Makefile.am |    4 +
 src/conf/ucm/Tuna/Tuna.conf   |   14 ++
 src/conf/ucm/Tuna/VoiceCall   |  245 ++++++++++++++++++++++++++++
 6 files changed, 619 insertions(+), 1 deletion(-)
 create mode 100644 src/conf/ucm/Tuna/HiFi
 create mode 100644 src/conf/ucm/Tuna/Makefile.am
 create mode 100644 src/conf/ucm/Tuna/Tuna.conf
 create mode 100644 src/conf/ucm/Tuna/VoiceCall

diff --git a/configure.ac b/configure.ac
index 25fdc81..de4e2ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,6 +670,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/ucm/SDP4430/Makefile \
 	  src/conf/ucm/tegraalc5632/Makefile \
 	  src/conf/ucm/apq8064-tabla-snd-card/Makefile \
+	  src/conf/ucm/Tuna/Makefile \
 	  modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
 	  alsalisp/Makefile aserver/Makefile \
 	  test/Makefile test/lsb/Makefile \
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index adb3c87..029e1e8 100644
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna
diff --git a/src/conf/ucm/Tuna/HiFi b/src/conf/ucm/Tuna/HiFi
new file mode 100644
index 0000000..3a7fe5e
--- /dev/null
+++ b/src/conf/ucm/Tuna/HiFi
@@ -0,0 +1,354 @@
+# Use case Configuration for TI Tuna HiFi audio playback and capture
+# By Liam Girdwood <lrg@ti.com>
+# Updated by Sebastien Jan <s-jan@ti.com>
+# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com>
+
+######### Main Verb Config #################
+
+SectionVerb {
+
+	EnableSequence [
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Enable ABE playback path through DL1
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='Sidetone Mixer Playback' 1"
+		cset "name='DL1 PDM Switch' 1"
+
+		# set ABE playback gains to 0dB
+		cset "name='DL1 Media Playback Volume' 120"
+		cset "name='DL2 Media Playback Volume' 120"
+		cset "name='SDT DL Volume' 120"
+
+		# Enable ABE PDM-UL Capture path
+		cset "name='MUX_UL10' 11"
+		cset "name='MUX_UL11' 12"
+
+		# set ABE capture gains to 0dB
+		cset "name='AMIC UL Volume' 120"
+
+		# Disable Earpiece output, leave enabling to device enable
+		# sequence
+		cset "name='Earphone Enable Switch' 0"
+	]
+
+	DisableSequence [
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Disable ABE playback path through DL1
+		cset "name='DL1 Mixer Multimedia' 0"
+		cset "name='Sidetone Mixer Playback' 0"
+		cset "name='DL1 PDM Switch' 0"
+
+		# mute ABE playback gains
+		cset "name='DL1 Media Playback Volume' 0"
+		cset "name='DL2 Media Playback Volume' 0"
+		cset "name='SDT DL Volume' 0"
+
+		# Disable ABE PDM-UL Capture path
+		cset "name='MUX_UL10' 0"
+		cset "name='MUX_UL11' 0"
+
+		# mute ABE capture gains
+		cset "name='AMIC UL Volume' 0"
+
+	]
+
+	# ALSA PCM
+	Value {
+
+		TQ "HiFi"
+
+		# ALSA PCM device for HiFi
+		PlaybackPCM "hw:Tuna,0"
+		CapturePCM "hw:Tuna,1"
+	}
+}
+
+###### Headset Devices Options ############
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	# Headset is mutually exclusive to some devices
+	ConflictingDevice [
+		"Mainmic"
+		"Submic"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Left Capture Route' 0"
+		cset "name='Analog Right Capture Route' 0"
+		cset "name='Capture Preamplifier Volume' 2"
+
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+		cset "name='Analog Right Capture Route' 3"
+		cset "name='Capture Preamplifier Volume' 0"
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+###### Headphones Devices Options ############
+
+SectionDevice."Headphones" {
+	Comment "Tuna 3.5mm Headphones playback"
+
+	# Headphones is mutually exclusive to some devices
+	ConflictingDevice [
+		"Speaker"
+		"Earpiece"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 playback path
+		cset "name='HS Left Playback' 1"
+		cset "name='HS Right Playback' 1"
+
+		cset "name='Headset Playback Volume' 14"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Headset Playback Volume' 0"
+		# TWL6040 playback path
+		cset "name='HS Right Playback' 0"
+		cset "name='HS Left Playback' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+########### Earpiece Device Options ################
+
+SectionDevice."Earpiece" {
+	Comment "Earpiece playback"
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 1"
+
+		cset "name='Earphone Enable Volume' 13"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Earphone Enable Volume' 0"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+########### Speaker Device Options ################
+
+SectionDevice."Speaker" {
+	Comment "Main speaker playback"
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Multimedia' 1"
+
+		# TWL6040 playback path
+		cset "name='HF Left Playback' 1"
+		cset "name='HF Right Playback' 1"
+
+		cset "name='Handsfree Playback Volume' 28"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		cset "name='Handsfree Playback Volume' 0"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Multimedia' 0"
+
+		# TWL6040 playback path
+		cset "name='HF Left Playback' 0"
+		cset "name='HF Right Playback' 0"
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+############ Main Mic Device #########################
+
+SectionDevice."Handset" {
+	Comment "Main Microphone Left Channel Capture"
+
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Left Capture Route' 0"
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+	]
+
+	Value {
+		# Default ALSA volume gain and mute kcontrols
+		CaptureChannels "2"
+	}
+}
+
+############ Sub Mic Device #########################
+
+SectionDevice."Submic" {
+	Comment "Sub Microphone Right Channel Capture"
+
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture Path
+		cset "name='Analog Right Capture Route' 1"
+
+		cset "name='Capture Volume' 4"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# TWL6040 Capture path
+		cset "name='Analog Right Capture Route' 3"
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+##############  Play Tone Modifier ####################
+#
+# We have 2 PlayTone modifiers. Each one supports different devices as the
+# path configuration is different depending on the device being used when
+# the modifier is enabled.
+#
+
+SectionModifier."PlayTone" {
+	Comment "Play a ring tone or system sound"
+
+	# For the following devices we need to set the DL2 path
+	SupportedDevice [
+		"Headphones"
+		"Earpiece"
+	]
+
+	EnableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 1"
+		cset "name='DL2 Tones Playback Volume' 120"
+		cset "name='DL1 Mixer Tones' 1"
+		cset "name='DL1 Tones Playback Volume' 120"
+
+#		# TWL6040 playback path
+#		cset "name='HF Left Playback' 1"
+#		cset "name='HF Right Playback' 1"
+	]
+
+	DisableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 0"
+		cset "name='DL2 Tones Playback Volume' 0"
+		cset "name='DL1 Mixer Tones' 0"
+		cset "name='DL1 Tones Playback Volume' 0"
+
+#		# TWL6040 playback path
+#		cset "name='HF Left Playback' 0"
+#		cset "name='HF Right Playback' 0"
+	]
+
+	# QoS, Mixers and ALSA PCMs
+	Value {
+		TQ "Tones"
+		PlaybackPCM "hw:Tuna,3"
+		PlaybackVolume "name='DL2 Tones Playback Volume' 120"
+	}
+}
+
+SectionModifier."PlayTone" {
+	Comment "Play a ring tone or system sound"
+
+	# For the following devices we dont need to set the DL2 path
+	SupportedDevice [
+		"Speaker"
+	]
+
+	EnableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# ABE playback path through DL2
+		cset "name='DL2 Mixer Tones' 1"
+		cset "name='DL2 Tones Playback Volume' 120"
+	]
+
+	DisableSequence [
+
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		cset "name='DL2 Mixer Tones' 0"
+	]
+
+	# QoS, Mixers and ALSA PCMs
+	Value {
+		TQ "Tones"
+		PlaybackPCM "hw:Tuna,3"
+		PlaybackVolume "name='DL2 Tones Playback Volume' 120"
+	}
+}
+
diff --git a/src/conf/ucm/Tuna/Makefile.am b/src/conf/ucm/Tuna/Makefile.am
new file mode 100644
index 0000000..f8a69dd
--- /dev/null
+++ b/src/conf/ucm/Tuna/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/Tuna
+ucm_DATA = Tuna.conf HiFi VoiceCall
+EXTRA_DIST = $(ucm_DATA)
diff --git a/src/conf/ucm/Tuna/Tuna.conf b/src/conf/ucm/Tuna/Tuna.conf
new file mode 100644
index 0000000..c517b21
--- /dev/null
+++ b/src/conf/ucm/Tuna/Tuna.conf
@@ -0,0 +1,14 @@
+# UCM configuration for SDP4430
+SectionUseCase."HiFi" {
+	File "HiFi"
+	Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."Voice Call" {
+	File "VoiceCall"
+	Comment "Voice Phone Call"
+}
+
+SectionDefaults [
+	cdev "hw:Tuna"
+]
diff --git a/src/conf/ucm/Tuna/VoiceCall b/src/conf/ucm/Tuna/VoiceCall
new file mode 100644
index 0000000..47a2ba3
--- /dev/null
+++ b/src/conf/ucm/Tuna/VoiceCall
@@ -0,0 +1,245 @@
+# Use case Configuration for TI Tuna RF MODEM Voice Call
+# By Liam Girdwood <lrg@ti.com>
+# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com>
+
+SectionVerb {
+
+	EnableSequence [
+		cdev "hw:Tuna"
+
+		# Enable ABE sidetone paths at 0dB (needs tuned)
+		cset "name='Sidetone Mixer Capture' 1"
+		cset "name='Sidetone Mixer Playback' 1"
+		cset "name='SDT DL Volume' 120"
+		cset "name='SDT UL Volume' 120"
+
+		# Enable ABE DL1 Voice at 0dB
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='DL1 Mixer Voice' 1"
+		cset "name='DL1 Voice Playback Volume' 120"
+
+		# Only enabled for Speaker
+		cset "name='DL2 Mixer Multimedia' 0"
+		cset "name='DL2 Mixer Voice' 0"
+
+		# Disable DL2 Mono Mixer
+		cset "name='DL2 Mono Mixer' 0"
+
+		# Enable Uplink
+		cset "name='Voice Capture Mixer Capture' 1"
+
+		# Todo - Execute modem startup command if required.
+
+		# FIXME: Copying Handset enable here to allow the PCM to be
+		# opened. Better fix required, possibly driver-side.
+		# Enable ABE paths to PDM and AMIC
+		cset "name='DL1 PDM Switch' 1"
+		cset "name='MUX_VX0' 11"
+		cset "name='MUX_VX1' 12"
+
+		# set ABE capture gains to 0dB
+		cset "name='AMIC UL Volume' 120"
+
+		# TWL6040 playback path
+		cset "name='Earphone Enable Switch' 1"
+
+		# TWL6040 Capture Path with Main Mic and Sub Mic
+		cset "name='Analog Left Capture Route' 1"
+		cset "name='Analog Right Capture Route' 1"
+		cset "name='Capture Preamplifier Volume' 2"
+		# END OF FIXME
+
+		# Enable extra PCMs
+
+		# ABE Music playback path through DL1 at 0dB (tune this)
+		cset "name='DL1 Mixer Multimedia' 1"
+		cset "name='DL1 Media Playback Volume' 120"
+
+		# Enable VX_REC for call capture at 0dB
+		cset "name='Capture Mixer Voice Playback' 1"
+		cset "name='Capture Mixer Voice Capture' 1"
+		cset "name='VXREC Voice UL Volume' 120"
+		cset "name='VXREC Voice DL Volume' 120"
+
+		# set ROUTE_UL path
+		cset "name='MUX_UL10' 13"
+		cset "name='MUX_UL11' 14"
+	]
+
+	DisableSequence [
+		cdev "hw:Tuna"
+
+		# Disable Extra PCMs
+
+		# Enable VX_REC for call capture at 0dB
+		cset "name='Capture Mixer Voice Playback' 0"
+		cset "name='Capture Mixer Voice Capture' 0"
+		cset "name='VXREC Voice UL Volume' 0"
+		cset "name='VXREC Voice DL Volume' 0"
+
+		# set ROUTE_UL path
+		cset "name='MUX_UL10' 0"
+		cset "name='MUX_UL11' 0"
+
+		# disable ABE Music path to near end
+		cset "name='DL1 Mixer Tones' 0"
+		cset "name='DL1 Tones Playback Volume' 0"
+
+		# ABE mute tone playback path through DL2
+		cset "name='DL2 Mixer Tones' 0"
+		cset "name='DL2 Tones Playback Volume' 0"
+
+		# Todo - Execute modem shutdown command if required.
+
+		# Disable ABE sidetone paths and mute (needs tuned)
+		cset "name='Sidetone Mixer Capture' 0"
+		cset "name='Sidetone Mixer Playback' 0"
+		cset "name='SDT DL Volume' 0"
+		cset "name='SDT UL Volume' 0"
+
+		# Disable ABE DL1 Voice and mute
+		cset "name='DL1 Mixer Voice' 0"
+		cset "name='DL1 Voice Playback Volume' 0"
+
+		# Enable DL2 Multimedia
+		cset "name='DL2 Mixer Multimedia' 1"
+
+		# Enable DL2 Mono Mixer
+		cset "name='DL2 Mono Mixer' 1"
+
+		# Disable Uplink
+		cset "name='Voice Capture Mixer Capture' 0"
+
+		# FIXME: Copying Handset disable here to allow the PCM to be
+		# opened. Better fix required, possibly driver-side.
+		# Set SDP device for following cset commands
+		cdev "hw:Tuna"
+
+		# Enable ABE paths
+		cset "name='DL1 PDM Switch' 0"
+		cset "name='MUX_VX0' 0"
+		cset "name='MUX_VX1' 0"
+
+		# mute ABE capture gains
+		cset "name='AMIC UL Volume' 120"
+
+		# TWL6040 playback path
+		cset "name='HS Right Playback' 0"
+		cset "name='HS Left Playback' 0"
+
+		# TWL6040 Capture path
+		cset "name='Analog Left Capture Route' 3"
+		cset "name='Analog Right Capture Route' 3"
+		cset "name='Capture Preamplifier Volume' 0"
+		# END OF FIXME
+	]
+
+	# QoS and ALSA PCMs
+	Value {
+		TQ "Voice"
+
+		CapturePCM "hw:Tuna,1"
+		PlaybackPCM "hw:Tuna,0"
+	}
+}
+
+SectionDevice."Earpiece" {
+	#Name "Earpiece"
+	Comment "Earpiece output"
+
+	# FIXME
+	ConflictingDevice [
+		"Headphones"
+		"Speaker"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+SectionDevice."Headphones" {
+	#Name "Earpiece"
+	Comment "Headphone output"
+
+	# FIXME
+	ConflictingDevice [
+		"Earpiece"
+		"Speaker"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+SectionDevice."Speaker" {
+	#Name "Earpiece"
+	Comment "Speaker output"
+
+	# FIXME
+	ConflictingDevice [
+		"Earpiece"
+		"Headphones"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackChannels "2"
+	}
+}
+
+
+SectionDevice."Handset" {
+	Comment "Main mic input"
+
+	# FIXME
+	ConflictingDevice [
+		"Headset"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+SectionDevice."Headset" {
+	Comment "Headset mic input"
+
+	# FIXME
+	ConflictingDevice [
+		"Handset"
+	]
+
+	EnableSequence [
+	]
+	DisableSequence [
+	]
+
+	Value {
+		CaptureChannels "2"
+	}
+}
+
+
+
+
-- 
1.7.9.5