diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-11-10 11:07:49 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-11-10 16:33:27 -0500 |
commit | a02f5895eee72fe365cdcbd26699a5b5091c9f1e (patch) | |
tree | e0200979c9fb675384f112d9bd290c47e4e3a564 /Documentation/sound | |
parent | 7bb97dfdcaca0963d59f986e0a88d5bcd0783552 (diff) |
ALSA: doc: ReSTize README.maya44
Another simple conversion from a plain text file.
Put to cards directory.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/cards/index.rst | 1 | ||||
-rw-r--r-- | Documentation/sound/cards/maya44.rst (renamed from Documentation/sound/alsa/README.maya44) | 137 |
2 files changed, 81 insertions, 57 deletions
diff --git a/Documentation/sound/cards/index.rst b/Documentation/sound/cards/index.rst index 157372faae06..6c8e4141df9a 100644 --- a/Documentation/sound/cards/index.rst +++ b/Documentation/sound/cards/index.rst | |||
@@ -13,3 +13,4 @@ Card-Specific Information | |||
13 | audiophile-usb | 13 | audiophile-usb |
14 | mixart | 14 | mixart |
15 | bt87x | 15 | bt87x |
16 | maya44 | ||
diff --git a/Documentation/sound/alsa/README.maya44 b/Documentation/sound/cards/maya44.rst index 67b2ea1cc31d..bf09a584b443 100644 --- a/Documentation/sound/alsa/README.maya44 +++ b/Documentation/sound/cards/maya44.rst | |||
@@ -1,10 +1,18 @@ | |||
1 | NOTE: The following is the original document of Rainer's patch that the | 1 | ================================= |
2 | current maya44 code based on. Some contents might be obsoleted, but I | 2 | Notes on Maya44 USB Audio Support |
3 | keep here as reference -- tiwai | 3 | ================================= |
4 | 4 | ||
5 | ---------------------------------------------------------------- | 5 | .. note:: |
6 | The following is the original document of Rainer's patch that the | ||
7 | current maya44 code based on. Some contents might be obsoleted, but I | ||
8 | keep here as reference -- tiwai | ||
9 | |||
10 | Feb 14, 2008 | ||
11 | |||
12 | Rainer Zimmermann <mail@lightshed.de> | ||
6 | 13 | ||
7 | STATE OF DEVELOPMENT: | 14 | STATE OF DEVELOPMENT |
15 | ==================== | ||
8 | 16 | ||
9 | This driver is being developed on the initiative of Piotr Makowski (oponek@gmail.com) and financed by Lars Bergmann. | 17 | This driver is being developed on the initiative of Piotr Makowski (oponek@gmail.com) and financed by Lars Bergmann. |
10 | Development is carried out by Rainer Zimmermann (mail@lightshed.de). | 18 | Development is carried out by Rainer Zimmermann (mail@lightshed.de). |
@@ -44,16 +52,17 @@ Things that do not seem to work: | |||
44 | - Ardour 2.1 seems to work only via JACK, not using ALSA directly or via OSS. This still needs to be tracked down. | 52 | - Ardour 2.1 seems to work only via JACK, not using ALSA directly or via OSS. This still needs to be tracked down. |
45 | 53 | ||
46 | 54 | ||
47 | DRIVER DETAILS: | 55 | DRIVER DETAILS |
56 | ============== | ||
48 | 57 | ||
49 | the following files were added: | 58 | the following files were added: |
50 | 59 | ||
51 | pci/ice1724/maya44.c - Maya44 specific code | 60 | * pci/ice1724/maya44.c - Maya44 specific code |
52 | pci/ice1724/maya44.h | 61 | * pci/ice1724/maya44.h |
53 | pci/ice1724/ice1724.patch | 62 | * pci/ice1724/ice1724.patch |
54 | pci/ice1724/ice1724.h.patch - PROPOSED patch to ice1724.h (see SAMPLING RATES) | 63 | * pci/ice1724/ice1724.h.patch - PROPOSED patch to ice1724.h (see SAMPLING RATES) |
55 | i2c/other/wm8776.c - low-level access routines for Wolfson WM8776 codecs | 64 | * i2c/other/wm8776.c - low-level access routines for Wolfson WM8776 codecs |
56 | include/wm8776.h | 65 | * include/wm8776.h |
57 | 66 | ||
58 | 67 | ||
59 | Note that the wm8776.c code is meant to be card-independent and does not actually register the codec with the ALSA infrastructure. | 68 | Note that the wm8776.c code is meant to be card-independent and does not actually register the codec with the ALSA infrastructure. |
@@ -62,25 +71,26 @@ This is done in maya44.c, mainly because some of the WM8776 controls are used in | |||
62 | 71 | ||
63 | the following files were created in pci/ice1724, simply #including the corresponding file from the alsa-kernel tree: | 72 | the following files were created in pci/ice1724, simply #including the corresponding file from the alsa-kernel tree: |
64 | 73 | ||
65 | wtm.h | 74 | * wtm.h |
66 | vt1720_mobo.h | 75 | * vt1720_mobo.h |
67 | revo.h | 76 | * revo.h |
68 | prodigy192.h | 77 | * prodigy192.h |
69 | pontis.h | 78 | * pontis.h |
70 | phase.h | 79 | * phase.h |
71 | maya44.h | 80 | * maya44.h |
72 | juli.h | 81 | * juli.h |
73 | aureon.h | 82 | * aureon.h |
74 | amp.h | 83 | * amp.h |
75 | envy24ht.h | 84 | * envy24ht.h |
76 | se.h | 85 | * se.h |
77 | prodigy_hifi.h | 86 | * prodigy_hifi.h |
78 | 87 | ||
79 | 88 | ||
80 | *I hope this is the correct way to do things.* | 89 | *I hope this is the correct way to do things.* |
81 | 90 | ||
82 | 91 | ||
83 | SAMPLING RATES: | 92 | SAMPLING RATES |
93 | ============== | ||
84 | 94 | ||
85 | The Maya44 card (or more exactly, the Wolfson WM8776 codecs) allow a maximum sampling rate of 192 kHz for playback and 92 kHz for capture. | 95 | The Maya44 card (or more exactly, the Wolfson WM8776 codecs) allow a maximum sampling rate of 192 kHz for playback and 92 kHz for capture. |
86 | 96 | ||
@@ -98,66 +108,79 @@ I propose some additional code for limiting the sampling rate when setting on a | |||
98 | The proposed code (currently deactivated) is in ice1712.h.patch, ice1724.c and maya44.c (in pci/ice1712). | 108 | The proposed code (currently deactivated) is in ice1712.h.patch, ice1724.c and maya44.c (in pci/ice1712). |
99 | 109 | ||
100 | 110 | ||
101 | SOUND DEVICES: | 111 | SOUND DEVICES |
112 | ============= | ||
102 | 113 | ||
103 | PCM devices correspond to inputs/outputs as follows (assuming Maya44 is card #0): | 114 | PCM devices correspond to inputs/outputs as follows (assuming Maya44 is card #0): |
104 | 115 | ||
105 | hw:0,0 input - stereo, analog input 1+2 | 116 | * hw:0,0 input - stereo, analog input 1+2 |
106 | hw:0,0 output - stereo, analog output 1+2 | 117 | * hw:0,0 output - stereo, analog output 1+2 |
107 | hw:0,1 input - stereo, analog input 3+4 OR S/PDIF input | 118 | * hw:0,1 input - stereo, analog input 3+4 OR S/PDIF input |
108 | hw:0,1 output - stereo, analog output 3+4 (and SPDIF out) | 119 | * hw:0,1 output - stereo, analog output 3+4 (and SPDIF out) |
109 | 120 | ||
110 | 121 | ||
111 | NAMING OF MIXER CONTROLS: | 122 | NAMING OF MIXER CONTROLS |
123 | ======================== | ||
112 | 124 | ||
113 | (for more information about the signal flow, please refer to the block diagram on p.24 of the ESI Maya44 manual, or in the ESI windows software). | 125 | (for more information about the signal flow, please refer to the block diagram on p.24 of the ESI Maya44 manual, or in the ESI windows software). |
114 | 126 | ||
115 | 127 | ||
116 | PCM: (digital) output level for channel 1+2 | 128 | PCM |
117 | PCM 1: same for channel 3+4 | 129 | (digital) output level for channel 1+2 |
130 | PCM 1 | ||
131 | same for channel 3+4 | ||
132 | |||
133 | Mic Phantom+48V | ||
134 | switch for +48V phantom power for electrostatic microphones on input 1/2. | ||
118 | 135 | ||
119 | Mic Phantom+48V: switch for +48V phantom power for electrostatic microphones on input 1/2. | ||
120 | Make sure this is not turned on while any other source is connected to input 1/2. | 136 | Make sure this is not turned on while any other source is connected to input 1/2. |
121 | It might damage the source and/or the maya44 card. | 137 | It might damage the source and/or the maya44 card. |
122 | 138 | ||
123 | Mic/Line input: if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo). | 139 | Mic/Line input |
140 | if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo). | ||
141 | |||
142 | Bypass | ||
143 | analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver. | ||
144 | Bypass 1 | ||
145 | same for channel 3+4. | ||
124 | 146 | ||
125 | Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver. | 147 | Crossmix |
126 | Bypass 1: same for channel 3+4. | 148 | cross-mixer from channels 1+2 to channels 3+4 |
149 | Crossmix 1 | ||
150 | cross-mixer from channels 3+4 to channels 1+2 | ||
127 | 151 | ||
128 | Crossmix: cross-mixer from channels 1+2 to channels 3+4 | 152 | IEC958 Output |
129 | Crossmix 1: cross-mixer from channels 3+4 to channels 1+2 | 153 | switch for S/PDIF output. |
130 | 154 | ||
131 | IEC958 Output: switch for S/PDIF output. | ||
132 | This is not supported by the ESI windows driver. | 155 | This is not supported by the ESI windows driver. |
133 | S/PDIF should output the same signal as channel 3+4. [untested!] | 156 | S/PDIF should output the same signal as channel 3+4. [untested!] |
134 | 157 | ||
135 | 158 | ||
136 | Digitial output selectors: | 159 | Digitial output selectors |
137 | |||
138 | These switches allow a direct digital routing from the ADCs to the DACs. | 160 | These switches allow a direct digital routing from the ADCs to the DACs. |
139 | Each switch determines where the digital input data to one of the DACs comes from. | 161 | Each switch determines where the digital input data to one of the DACs comes from. |
140 | They are not supported by the ESI windows driver. | 162 | They are not supported by the ESI windows driver. |
141 | For normal operation, they should all be set to "PCM out". | 163 | For normal operation, they should all be set to "PCM out". |
142 | 164 | ||
143 | H/W: Output source channel 1 | 165 | H/W |
144 | H/W 1: Output source channel 2 | 166 | Output source channel 1 |
145 | H/W 2: Output source channel 3 | 167 | H/W 1 |
146 | H/W 3: Output source channel 4 | 168 | Output source channel 2 |
169 | H/W 2 | ||
170 | Output source channel 3 | ||
171 | H/W 3 | ||
172 | Output source channel 4 | ||
173 | |||
174 | H/W 4 ... H/W 9 | ||
175 | unknown function, left in to enable testing. | ||
147 | 176 | ||
148 | H/W 4 ... H/W 9: unknown function, left in to enable testing. | ||
149 | Possibly some of these control S/PDIF output(s). | 177 | Possibly some of these control S/PDIF output(s). |
150 | If these turn out to be unused, they will go away in later driver versions. | 178 | If these turn out to be unused, they will go away in later driver versions. |
151 | 179 | ||
152 | Selectable values for each of the digital output selectors are: | 180 | Selectable values for each of the digital output selectors are: |
153 | "PCM out" -> DAC output of the corresponding channel (default setting) | ||
154 | "Input 1"... | ||
155 | "Input 4" -> direct routing from ADC output of the selected input channel | ||
156 | |||
157 | 181 | ||
158 | -------- | 182 | PCM out |
159 | 183 | DAC output of the corresponding channel (default setting) | |
160 | Feb 14, 2008 | 184 | Input 1 ... Input 4 |
161 | Rainer Zimmermann | 185 | direct routing from ADC output of the selected input channel |
162 | mail@lightshed.de | ||
163 | 186 | ||