← Back to branch summary

~ubuntu-audio-dev/alsa-utils/ubuntu.natty

« back to all changes in this revision

Viewing changes to debian/patches/add_omap4_support.patch

  • Committer: Luke Yelavich
  • Date: 2011-04-14 11:34:56 UTC
  • Revision ID: luke.yelavich@canonical.com-20110414113456-jinpn8ib2b1bb335
https://launchpad.net/bugs/760571
Remove omap4 alsa init configuration files, as its likely to conflict with
UCM (LP: #760571)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add_omap4_support.patch
1
 
## Description: add some description
2
 
## Origin/Author: add some origin or author
3
 
## Bug: bug URL
4
 
Index: alsa-utils-1.0.23/alsactl/init/00main
5
 
===================================================================
6
 
--- alsa-utils-1.0.23.orig/alsactl/init/00main  2010-10-18 15:18:38.667648001 +0200
7
 
+++ alsa-utils-1.0.23/alsactl/init/00main       2010-10-18 15:18:38.687648001 +0200
8
 
@@ -32,6 +32,7 @@
9
 
 # real ALSA configuration database
10
 
 CARDINFO{driver}=="HDA-Intel", INCLUDE="hda", GOTO="init_end"
11
 
 CARDINFO{driver}=="CA0106", INCLUDE="ca0106", GOTO="init_end"
12
 
+CARDINFO{driver}=="OMAP4", INCLUDE="omap4", GOTO="init_end"
13
 
 CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end"
14
 
 
15
 
 LABEL="init_end"
16
 
Index: alsa-utils-1.0.23/alsactl/init/omap4
17
 
===================================================================
18
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
19
 
+++ alsa-utils-1.0.23/alsactl/init/omap4        2010-10-18 15:18:38.687648001 +0200
20
 
@@ -0,0 +1,85 @@
21
 
+# Configuration for OMAP4 Based Cards
22
 
+
23
 
+CARDINFO{name}=="SDP4430", \
24
 
+    GOTO="SDP4430"
25
 
+CARDINFO{name}=="Panda", \
26
 
+    GOTO="Panda"
27
 
+RESULT="false", EXIT="return"
28
 
+
29
 
+LABEL="Panda"
30
 
+# playback on Handsfree
31
 
+# TODO: Panda does not use DL2, lets streamline this to conserve power.
32
 
+CTL{reset}="mixer"
33
 
+CTL{name}="DL2 Mixer Multimedia", CTL{value}="on"
34
 
+CTL{name}="SDT DL Volume", CTL{value}="72"
35
 
+CTL{name}="Handsfree Playback Volume", CTL{value}="22,22"
36
 
+CTL{name}="HF Left Playback", CTL{value}="HF DAC"
37
 
+CTL{name}="HF Right Playback", CTL{value}="HF DAC"
38
 
+CTL{name}="DL2 Media Playback Volume", CTL{value}="86"
39
 
+CTL{name}="DL2 Mixer Tones", CTL{value}="on"
40
 
+CTL{name}="DL2 Tones Playback Volume", CTL{value}="86"
41
 
+CTL{name}="DL2 Mixer Voice", CTL{value}="on"
42
 
+CTL{name}="DL2 Voice Playback Volume", CTL{value}="86"
43
 
+CTL{name}="Headset Playback Volume", CTL{value}="13,13"
44
 
+CTL{name}="HS Left Playback", CTL{value}="HS DAC"
45
 
+CTL{name}="HS Right Playback", CTL{value}="HS DAC"
46
 
+CTL{name}="Sidetone Mixer Playback", CTL{value}="on"
47
 
+CTL{name}="DL1 PDM Switch", CTL{value}="on"
48
 
+CTL{name}="DL1 Mixer Multimedia", CTL{value}="on"
49
 
+CTL{name}="DL1 Media Playback Volume", CTL{value}="86"
50
 
+CTL{name}="DL1 Mixer Tones", CTL{value}="on"
51
 
+CTL{name}="DL1 Tones Playback Volume", CTL{value}="86"
52
 
+CTL{name}="DL1 Mixer Voice", CTL{value}="on"
53
 
+CTL{name}="DL1 Voice Playback Volume", CTL{value}="86"
54
 
+# # capture
55
 
+CTL{name}="Analog Right Capture Route", CTL{value}="Sub Mic"
56
 
+CTL{name}="Analog Left Capture Route", CTL{value}="Main Mic"
57
 
+CTL{name}="Capture Preamplifier Volume", CTL{value}="1,1"
58
 
+CTL{name}="Capture Volume", CTL{value}="4,4"
59
 
+CTL{name}="MUX_UL00", CTL{value}="AMic1"
60
 
+CTL{name}="MUX_UL01", CTL{value}="AMic0"
61
 
+CTL{name}="MUX_UL10", CTL{value}="AMic1"
62
 
+CTL{name}="MUX_UL11", CTL{value}="AMic0"
63
 
+CTL{name}="AMIC_UL PDM Switch", CTL{value}="on"
64
 
+CTL{name}="MUX_VX0", CTL{value}="AMic1"
65
 
+CTL{name}="MUX_VX1", CTL{value}="AMic0"
66
 
+CTL{name}="Voice Capture Mixer Capture", CTL{value}="on"
67
 
+RESULT="true", EXIT="return"
68
 
+
69
 
+LABEL="SDP4430"
70
 
+CTL{reset}="mixer"
71
 
+CTL{name}="DL2 Mixer Multimedia", CTL{value}="on"
72
 
+CTL{name}="SDT DL Volume", CTL{value}="72"
73
 
+CTL{name}="Handsfree Playback Volume", CTL{value}="22,22"
74
 
+CTL{name}="HF Left Playback", CTL{value}="HF DAC"
75
 
+CTL{name}="HF Right Playback", CTL{value}="HF DAC"
76
 
+CTL{name}="DL2 Media Playback Volume", CTL{value}="86"
77
 
+CTL{name}="DL2 Mixer Tones", CTL{value}="on"
78
 
+CTL{name}="DL2 Tones Playback Volume", CTL{value}="86"
79
 
+CTL{name}="DL2 Mixer Voice", CTL{value}="on"
80
 
+CTL{name}="DL2 Voice Playback Volume", CTL{value}="86"
81
 
+CTL{name}="Headset Playback Volume", CTL{value}="13,13"
82
 
+CTL{name}="HS Left Playback", CTL{value}="HS DAC"
83
 
+CTL{name}="HS Right Playback", CTL{value}="HS DAC"
84
 
+CTL{name}="Sidetone Mixer Playback", CTL{value}="on"
85
 
+CTL{name}="DL1 PDM Switch", CTL{value}="on"
86
 
+CTL{name}="DL1 Mixer Multimedia", CTL{value}="on"
87
 
+CTL{name}="DL1 Media Playback Volume", CTL{value}="86"
88
 
+CTL{name}="DL1 Mixer Tones", CTL{value}="on"
89
 
+CTL{name}="DL1 Tones Playback Volume", CTL{value}="86"
90
 
+CTL{name}="DL1 Mixer Voice", CTL{value}="on"
91
 
+CTL{name}="DL1 Voice Playback Volume", CTL{value}="86"
92
 
+# # capture
93
 
+CTL{name}="Analog Right Capture Route", CTL{value}="Sub Mic"
94
 
+CTL{name}="Analog Left Capture Route", CTL{value}="Main Mic"
95
 
+CTL{name}="Capture Preamplifier Volume", CTL{value}="1,1"
96
 
+CTL{name}="Capture Volume", CTL{value}="4,4"
97
 
+CTL{name}="MUX_UL00", CTL{value}="AMic1"
98
 
+CTL{name}="MUX_UL01", CTL{value}="AMic0"
99
 
+CTL{name}="MUX_UL10", CTL{value}="AMic1"
100
 
+CTL{name}="MUX_UL11", CTL{value}="AMic0"
101
 
+CTL{name}="AMIC_UL PDM Switch", CTL{value}="on"
102
 
+CTL{name}="MUX_VX0", CTL{value}="AMic1"
103
 
+CTL{name}="MUX_VX1", CTL{value}="AMic0"
104
 
+CTL{name}="Voice Capture Mixer Capture", CTL{value}="on"
105
 
+RESULT="true", EXIT="return"
106
 
Index: alsa-utils-1.0.23/alsactl/init/Makefile.am
107
 
===================================================================
108
 
--- alsa-utils-1.0.23.orig/alsactl/init/Makefile.am     2010-10-18 15:19:15.743648002 +0200
109
 
+++ alsa-utils-1.0.23/alsactl/init/Makefile.am  2010-10-18 15:19:14.271648001 +0200
110
 
@@ -1,7 +1,7 @@
111
 
 
112
 
 init_files = \
113
 
        00main default help info test \
114
 
-       hda
115
 
+       hda omap4
116
 
 EXTRA_DIST = $(init_files)
117
 
 alsainitdir = $(datadir)/alsa/init
118
 
 alsainit_DATA = $(init_files)
119
 
Index: alsa-utils-1.0.23/alsactl/init/Makefile.in
120
 
===================================================================
121
 
--- alsa-utils-1.0.23.orig/alsactl/init/Makefile.in     2010-10-18 15:19:15.675648002 +0200
122
 
+++ alsa-utils-1.0.23/alsactl/init/Makefile.in  2010-10-18 15:19:01.411648001 +0200
123
 
@@ -201,7 +201,7 @@
124
 
 xmlto = @xmlto@
125
 
 init_files = \
126
 
        00main default help info test \
127
 
-       hda
128
 
+       hda omap4
129
 
 
130
 
 EXTRA_DIST = $(init_files)
131
 
 alsainitdir = $(datadir)/alsa/init