1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * PMac Burgundy lowlevel functions 2 * PMac Burgundy lowlevel functions
4 * 3 *
5 * Copyright (c) by Takashi Iwai <tiwai@suse.d 4 * Copyright (c) by Takashi Iwai <tiwai@suse.de>
6 * code based on dmasound.c. 5 * code based on dmasound.c.
>> 6 *
>> 7 * This program is free software; you can redistribute it and/or modify
>> 8 * it under the terms of the GNU General Public License as published by
>> 9 * the Free Software Foundation; either version 2 of the License, or
>> 10 * (at your option) any later version.
>> 11 *
>> 12 * This program is distributed in the hope that it will be useful,
>> 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> 15 * GNU General Public License for more details.
>> 16 *
>> 17 * You should have received a copy of the GNU General Public License
>> 18 * along with this program; if not, write to the Free Software
>> 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7 */ 20 */
8 21
9 #include <linux/io.h> !! 22 #include <asm/io.h>
10 #include <linux/init.h> 23 #include <linux/init.h>
11 #include <linux/delay.h> 24 #include <linux/delay.h>
12 #include <linux/of.h> <<
13 #include <sound/core.h> 25 #include <sound/core.h>
14 #include "pmac.h" 26 #include "pmac.h"
15 #include "burgundy.h" 27 #include "burgundy.h"
16 28
17 29
18 /* Waits for busy flag to clear */ 30 /* Waits for busy flag to clear */
19 static inline void 31 static inline void
20 snd_pmac_burgundy_busy_wait(struct snd_pmac *c 32 snd_pmac_burgundy_busy_wait(struct snd_pmac *chip)
21 { 33 {
22 int timeout = 50; 34 int timeout = 50;
23 while ((in_le32(&chip->awacs->codec_ct 35 while ((in_le32(&chip->awacs->codec_ctrl) & MASK_NEWECMD) && timeout--)
24 udelay(1); 36 udelay(1);
25 if (timeout < 0) 37 if (timeout < 0)
26 printk(KERN_DEBUG "burgundy_bu 38 printk(KERN_DEBUG "burgundy_busy_wait: timeout\n");
27 } 39 }
28 40
29 static inline void 41 static inline void
30 snd_pmac_burgundy_extend_wait(struct snd_pmac 42 snd_pmac_burgundy_extend_wait(struct snd_pmac *chip)
31 { 43 {
32 int timeout; 44 int timeout;
33 timeout = 50; 45 timeout = 50;
34 while (!(in_le32(&chip->awacs->codec_s 46 while (!(in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
35 udelay(1); 47 udelay(1);
36 if (timeout < 0) 48 if (timeout < 0)
37 printk(KERN_DEBUG "burgundy_ex 49 printk(KERN_DEBUG "burgundy_extend_wait: timeout #1\n");
38 timeout = 50; 50 timeout = 50;
39 while ((in_le32(&chip->awacs->codec_st 51 while ((in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
40 udelay(1); 52 udelay(1);
41 if (timeout < 0) 53 if (timeout < 0)
42 printk(KERN_DEBUG "burgundy_ex 54 printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n");
43 } 55 }
44 56
45 static void 57 static void
46 snd_pmac_burgundy_wcw(struct snd_pmac *chip, u 58 snd_pmac_burgundy_wcw(struct snd_pmac *chip, unsigned addr, unsigned val)
47 { 59 {
48 out_le32(&chip->awacs->codec_ctrl, add 60 out_le32(&chip->awacs->codec_ctrl, addr + 0x200c00 + (val & 0xff));
49 snd_pmac_burgundy_busy_wait(chip); 61 snd_pmac_burgundy_busy_wait(chip);
50 out_le32(&chip->awacs->codec_ctrl, add 62 out_le32(&chip->awacs->codec_ctrl, addr + 0x200d00 +((val>>8) & 0xff));
51 snd_pmac_burgundy_busy_wait(chip); 63 snd_pmac_burgundy_busy_wait(chip);
52 out_le32(&chip->awacs->codec_ctrl, add 64 out_le32(&chip->awacs->codec_ctrl, addr + 0x200e00 +((val>>16) & 0xff));
53 snd_pmac_burgundy_busy_wait(chip); 65 snd_pmac_burgundy_busy_wait(chip);
54 out_le32(&chip->awacs->codec_ctrl, add 66 out_le32(&chip->awacs->codec_ctrl, addr + 0x200f00 +((val>>24) & 0xff));
55 snd_pmac_burgundy_busy_wait(chip); 67 snd_pmac_burgundy_busy_wait(chip);
56 } 68 }
57 69
58 static unsigned 70 static unsigned
59 snd_pmac_burgundy_rcw(struct snd_pmac *chip, u 71 snd_pmac_burgundy_rcw(struct snd_pmac *chip, unsigned addr)
60 { 72 {
61 unsigned val = 0; 73 unsigned val = 0;
62 unsigned long flags; 74 unsigned long flags;
63 75
64 spin_lock_irqsave(&chip->reg_lock, fla 76 spin_lock_irqsave(&chip->reg_lock, flags);
65 77
66 out_le32(&chip->awacs->codec_ctrl, add 78 out_le32(&chip->awacs->codec_ctrl, addr + 0x100000);
67 snd_pmac_burgundy_busy_wait(chip); 79 snd_pmac_burgundy_busy_wait(chip);
68 snd_pmac_burgundy_extend_wait(chip); 80 snd_pmac_burgundy_extend_wait(chip);
69 val += (in_le32(&chip->awacs->codec_st 81 val += (in_le32(&chip->awacs->codec_stat) >> 4) & 0xff;
70 82
71 out_le32(&chip->awacs->codec_ctrl, add 83 out_le32(&chip->awacs->codec_ctrl, addr + 0x100100);
72 snd_pmac_burgundy_busy_wait(chip); 84 snd_pmac_burgundy_busy_wait(chip);
73 snd_pmac_burgundy_extend_wait(chip); 85 snd_pmac_burgundy_extend_wait(chip);
74 val += ((in_le32(&chip->awacs->codec_s 86 val += ((in_le32(&chip->awacs->codec_stat)>>4) & 0xff) <<8;
75 87
76 out_le32(&chip->awacs->codec_ctrl, add 88 out_le32(&chip->awacs->codec_ctrl, addr + 0x100200);
77 snd_pmac_burgundy_busy_wait(chip); 89 snd_pmac_burgundy_busy_wait(chip);
78 snd_pmac_burgundy_extend_wait(chip); 90 snd_pmac_burgundy_extend_wait(chip);
79 val += ((in_le32(&chip->awacs->codec_s 91 val += ((in_le32(&chip->awacs->codec_stat)>>4) & 0xff) <<16;
80 92
81 out_le32(&chip->awacs->codec_ctrl, add 93 out_le32(&chip->awacs->codec_ctrl, addr + 0x100300);
82 snd_pmac_burgundy_busy_wait(chip); 94 snd_pmac_burgundy_busy_wait(chip);
83 snd_pmac_burgundy_extend_wait(chip); 95 snd_pmac_burgundy_extend_wait(chip);
84 val += ((in_le32(&chip->awacs->codec_s 96 val += ((in_le32(&chip->awacs->codec_stat)>>4) & 0xff) <<24;
85 97
86 spin_unlock_irqrestore(&chip->reg_lock 98 spin_unlock_irqrestore(&chip->reg_lock, flags);
87 99
88 return val; 100 return val;
89 } 101 }
90 102
91 static void 103 static void
92 snd_pmac_burgundy_wcb(struct snd_pmac *chip, u 104 snd_pmac_burgundy_wcb(struct snd_pmac *chip, unsigned int addr,
93 unsigned int val) 105 unsigned int val)
94 { 106 {
95 out_le32(&chip->awacs->codec_ctrl, add 107 out_le32(&chip->awacs->codec_ctrl, addr + 0x300000 + (val & 0xff));
96 snd_pmac_burgundy_busy_wait(chip); 108 snd_pmac_burgundy_busy_wait(chip);
97 } 109 }
98 110
99 static unsigned 111 static unsigned
100 snd_pmac_burgundy_rcb(struct snd_pmac *chip, u 112 snd_pmac_burgundy_rcb(struct snd_pmac *chip, unsigned int addr)
101 { 113 {
102 unsigned val = 0; 114 unsigned val = 0;
103 unsigned long flags; 115 unsigned long flags;
104 116
105 spin_lock_irqsave(&chip->reg_lock, fla 117 spin_lock_irqsave(&chip->reg_lock, flags);
106 118
107 out_le32(&chip->awacs->codec_ctrl, add 119 out_le32(&chip->awacs->codec_ctrl, addr + 0x100000);
108 snd_pmac_burgundy_busy_wait(chip); 120 snd_pmac_burgundy_busy_wait(chip);
109 snd_pmac_burgundy_extend_wait(chip); 121 snd_pmac_burgundy_extend_wait(chip);
110 val += (in_le32(&chip->awacs->codec_st 122 val += (in_le32(&chip->awacs->codec_stat) >> 4) & 0xff;
111 123
112 spin_unlock_irqrestore(&chip->reg_lock 124 spin_unlock_irqrestore(&chip->reg_lock, flags);
113 125
114 return val; 126 return val;
115 } 127 }
116 128
117 #define BASE2ADDR(base) ((base) << 12) 129 #define BASE2ADDR(base) ((base) << 12)
118 #define ADDR2BASE(addr) ((addr) >> 12) 130 #define ADDR2BASE(addr) ((addr) >> 12)
119 131
120 /* 132 /*
121 * Burgundy volume: 0 - 100, stereo, word reg 133 * Burgundy volume: 0 - 100, stereo, word reg
122 */ 134 */
123 static void 135 static void
124 snd_pmac_burgundy_write_volume(struct snd_pmac 136 snd_pmac_burgundy_write_volume(struct snd_pmac *chip, unsigned int address,
125 long *volume, i 137 long *volume, int shift)
126 { 138 {
127 int hardvolume, lvolume, rvolume; 139 int hardvolume, lvolume, rvolume;
128 140
129 if (volume[0] < 0 || volume[0] > 100 | 141 if (volume[0] < 0 || volume[0] > 100 ||
130 volume[1] < 0 || volume[1] > 100) 142 volume[1] < 0 || volume[1] > 100)
131 return; /* -EINVAL */ 143 return; /* -EINVAL */
132 lvolume = volume[0] ? volume[0] + BURG 144 lvolume = volume[0] ? volume[0] + BURGUNDY_VOLUME_OFFSET : 0;
133 rvolume = volume[1] ? volume[1] + BURG 145 rvolume = volume[1] ? volume[1] + BURGUNDY_VOLUME_OFFSET : 0;
134 146
135 hardvolume = lvolume + (rvolume << shi 147 hardvolume = lvolume + (rvolume << shift);
136 if (shift == 8) 148 if (shift == 8)
137 hardvolume |= hardvolume << 16 149 hardvolume |= hardvolume << 16;
138 150
139 snd_pmac_burgundy_wcw(chip, address, h 151 snd_pmac_burgundy_wcw(chip, address, hardvolume);
140 } 152 }
141 153
142 static void 154 static void
143 snd_pmac_burgundy_read_volume(struct snd_pmac 155 snd_pmac_burgundy_read_volume(struct snd_pmac *chip, unsigned int address,
144 long *volume, in 156 long *volume, int shift)
145 { 157 {
146 int wvolume; 158 int wvolume;
147 159
148 wvolume = snd_pmac_burgundy_rcw(chip, 160 wvolume = snd_pmac_burgundy_rcw(chip, address);
149 161
150 volume[0] = wvolume & 0xff; 162 volume[0] = wvolume & 0xff;
151 if (volume[0] >= BURGUNDY_VOLUME_OFFSE 163 if (volume[0] >= BURGUNDY_VOLUME_OFFSET)
152 volume[0] -= BURGUNDY_VOLUME_O 164 volume[0] -= BURGUNDY_VOLUME_OFFSET;
153 else 165 else
154 volume[0] = 0; 166 volume[0] = 0;
155 volume[1] = (wvolume >> shift) & 0xff; 167 volume[1] = (wvolume >> shift) & 0xff;
156 if (volume[1] >= BURGUNDY_VOLUME_OFFSE 168 if (volume[1] >= BURGUNDY_VOLUME_OFFSET)
157 volume[1] -= BURGUNDY_VOLUME_O 169 volume[1] -= BURGUNDY_VOLUME_OFFSET;
158 else 170 else
159 volume[1] = 0; 171 volume[1] = 0;
160 } 172 }
161 173
162 static int snd_pmac_burgundy_info_volume(struc 174 static int snd_pmac_burgundy_info_volume(struct snd_kcontrol *kcontrol,
163 struc 175 struct snd_ctl_elem_info *uinfo)
164 { 176 {
165 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTE 177 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
166 uinfo->count = 2; 178 uinfo->count = 2;
167 uinfo->value.integer.min = 0; 179 uinfo->value.integer.min = 0;
168 uinfo->value.integer.max = 100; 180 uinfo->value.integer.max = 100;
169 return 0; 181 return 0;
170 } 182 }
171 183
172 static int snd_pmac_burgundy_get_volume(struct 184 static int snd_pmac_burgundy_get_volume(struct snd_kcontrol *kcontrol,
173 struct 185 struct snd_ctl_elem_value *ucontrol)
174 { 186 {
175 struct snd_pmac *chip = snd_kcontrol_c 187 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
176 unsigned int addr = BASE2ADDR(kcontrol 188 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
177 int shift = (kcontrol->private_value > 189 int shift = (kcontrol->private_value >> 8) & 0xff;
178 snd_pmac_burgundy_read_volume(chip, ad 190 snd_pmac_burgundy_read_volume(chip, addr,
179 ucontrol 191 ucontrol->value.integer.value, shift);
180 return 0; 192 return 0;
181 } 193 }
182 194
183 static int snd_pmac_burgundy_put_volume(struct 195 static int snd_pmac_burgundy_put_volume(struct snd_kcontrol *kcontrol,
184 struct 196 struct snd_ctl_elem_value *ucontrol)
185 { 197 {
186 struct snd_pmac *chip = snd_kcontrol_c 198 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
187 unsigned int addr = BASE2ADDR(kcontrol 199 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
188 int shift = (kcontrol->private_value > 200 int shift = (kcontrol->private_value >> 8) & 0xff;
189 long nvoices[2]; 201 long nvoices[2];
190 202
191 snd_pmac_burgundy_write_volume(chip, a 203 snd_pmac_burgundy_write_volume(chip, addr,
192 ucontro 204 ucontrol->value.integer.value, shift);
193 snd_pmac_burgundy_read_volume(chip, ad 205 snd_pmac_burgundy_read_volume(chip, addr, nvoices, shift);
194 return (nvoices[0] != ucontrol->value. 206 return (nvoices[0] != ucontrol->value.integer.value[0] ||
195 nvoices[1] != ucontrol->value. 207 nvoices[1] != ucontrol->value.integer.value[1]);
196 } 208 }
197 209
198 #define BURGUNDY_VOLUME_W(xname, xindex, addr, 210 #define BURGUNDY_VOLUME_W(xname, xindex, addr, shift) \
199 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = 211 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
200 .info = snd_pmac_burgundy_info_volume,\ 212 .info = snd_pmac_burgundy_info_volume,\
201 .get = snd_pmac_burgundy_get_volume,\ 213 .get = snd_pmac_burgundy_get_volume,\
202 .put = snd_pmac_burgundy_put_volume,\ 214 .put = snd_pmac_burgundy_put_volume,\
203 .private_value = ((ADDR2BASE(addr) & 0xff) | 215 .private_value = ((ADDR2BASE(addr) & 0xff) | ((shift) << 8)) }
204 216
205 /* 217 /*
206 * Burgundy volume: 0 - 100, stereo, 2-byte re 218 * Burgundy volume: 0 - 100, stereo, 2-byte reg
207 */ 219 */
208 static void 220 static void
209 snd_pmac_burgundy_write_volume_2b(struct snd_p 221 snd_pmac_burgundy_write_volume_2b(struct snd_pmac *chip, unsigned int address,
210 long *volume 222 long *volume, int off)
211 { 223 {
212 int lvolume, rvolume; 224 int lvolume, rvolume;
213 225
214 off |= off << 2; 226 off |= off << 2;
215 lvolume = volume[0] ? volume[0] + BURG 227 lvolume = volume[0] ? volume[0] + BURGUNDY_VOLUME_OFFSET : 0;
216 rvolume = volume[1] ? volume[1] + BURG 228 rvolume = volume[1] ? volume[1] + BURGUNDY_VOLUME_OFFSET : 0;
217 229
218 snd_pmac_burgundy_wcb(chip, address + 230 snd_pmac_burgundy_wcb(chip, address + off, lvolume);
219 snd_pmac_burgundy_wcb(chip, address + 231 snd_pmac_burgundy_wcb(chip, address + off + 0x500, rvolume);
220 } 232 }
221 233
222 static void 234 static void
223 snd_pmac_burgundy_read_volume_2b(struct snd_pm 235 snd_pmac_burgundy_read_volume_2b(struct snd_pmac *chip, unsigned int address,
224 long *volume, 236 long *volume, int off)
225 { 237 {
226 volume[0] = snd_pmac_burgundy_rcb(chip 238 volume[0] = snd_pmac_burgundy_rcb(chip, address + off);
227 if (volume[0] >= BURGUNDY_VOLUME_OFFSE 239 if (volume[0] >= BURGUNDY_VOLUME_OFFSET)
228 volume[0] -= BURGUNDY_VOLUME_O 240 volume[0] -= BURGUNDY_VOLUME_OFFSET;
229 else 241 else
230 volume[0] = 0; 242 volume[0] = 0;
231 volume[1] = snd_pmac_burgundy_rcb(chip 243 volume[1] = snd_pmac_burgundy_rcb(chip, address + off + 0x100);
232 if (volume[1] >= BURGUNDY_VOLUME_OFFSE 244 if (volume[1] >= BURGUNDY_VOLUME_OFFSET)
233 volume[1] -= BURGUNDY_VOLUME_O 245 volume[1] -= BURGUNDY_VOLUME_OFFSET;
234 else 246 else
235 volume[1] = 0; 247 volume[1] = 0;
236 } 248 }
237 249
238 static int snd_pmac_burgundy_info_volume_2b(st 250 static int snd_pmac_burgundy_info_volume_2b(struct snd_kcontrol *kcontrol,
239 st 251 struct snd_ctl_elem_info *uinfo)
240 { 252 {
241 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTE 253 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
242 uinfo->count = 2; 254 uinfo->count = 2;
243 uinfo->value.integer.min = 0; 255 uinfo->value.integer.min = 0;
244 uinfo->value.integer.max = 100; 256 uinfo->value.integer.max = 100;
245 return 0; 257 return 0;
246 } 258 }
247 259
248 static int snd_pmac_burgundy_get_volume_2b(str 260 static int snd_pmac_burgundy_get_volume_2b(struct snd_kcontrol *kcontrol,
249 str 261 struct snd_ctl_elem_value *ucontrol)
250 { 262 {
251 struct snd_pmac *chip = snd_kcontrol_c 263 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
252 unsigned int addr = BASE2ADDR(kcontrol 264 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
253 int off = kcontrol->private_value & 0x 265 int off = kcontrol->private_value & 0x300;
254 snd_pmac_burgundy_read_volume_2b(chip, 266 snd_pmac_burgundy_read_volume_2b(chip, addr,
255 ucontrol->value.intege 267 ucontrol->value.integer.value, off);
256 return 0; 268 return 0;
257 } 269 }
258 270
259 static int snd_pmac_burgundy_put_volume_2b(str 271 static int snd_pmac_burgundy_put_volume_2b(struct snd_kcontrol *kcontrol,
260 str 272 struct snd_ctl_elem_value *ucontrol)
261 { 273 {
262 struct snd_pmac *chip = snd_kcontrol_c 274 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
263 unsigned int addr = BASE2ADDR(kcontrol 275 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
264 int off = kcontrol->private_value & 0x 276 int off = kcontrol->private_value & 0x300;
265 long nvoices[2]; 277 long nvoices[2];
266 278
267 snd_pmac_burgundy_write_volume_2b(chip 279 snd_pmac_burgundy_write_volume_2b(chip, addr,
268 ucontrol->value.intege 280 ucontrol->value.integer.value, off);
269 snd_pmac_burgundy_read_volume_2b(chip, 281 snd_pmac_burgundy_read_volume_2b(chip, addr, nvoices, off);
270 return (nvoices[0] != ucontrol->value. 282 return (nvoices[0] != ucontrol->value.integer.value[0] ||
271 nvoices[1] != ucontrol->value. 283 nvoices[1] != ucontrol->value.integer.value[1]);
272 } 284 }
273 285
274 #define BURGUNDY_VOLUME_2B(xname, xindex, addr 286 #define BURGUNDY_VOLUME_2B(xname, xindex, addr, off) \
275 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = 287 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
276 .info = snd_pmac_burgundy_info_volume_2b,\ 288 .info = snd_pmac_burgundy_info_volume_2b,\
277 .get = snd_pmac_burgundy_get_volume_2b,\ 289 .get = snd_pmac_burgundy_get_volume_2b,\
278 .put = snd_pmac_burgundy_put_volume_2b,\ 290 .put = snd_pmac_burgundy_put_volume_2b,\
279 .private_value = ((ADDR2BASE(addr) & 0xff) | 291 .private_value = ((ADDR2BASE(addr) & 0xff) | ((off) << 8)) }
280 292
281 /* 293 /*
282 * Burgundy gain/attenuation: 0 - 15, mono/ste 294 * Burgundy gain/attenuation: 0 - 15, mono/stereo, byte reg
283 */ 295 */
284 static int snd_pmac_burgundy_info_gain(struct 296 static int snd_pmac_burgundy_info_gain(struct snd_kcontrol *kcontrol,
285 struct 297 struct snd_ctl_elem_info *uinfo)
286 { 298 {
287 int stereo = (kcontrol->private_value 299 int stereo = (kcontrol->private_value >> 24) & 1;
288 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTE 300 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
289 uinfo->count = stereo + 1; 301 uinfo->count = stereo + 1;
290 uinfo->value.integer.min = 0; 302 uinfo->value.integer.min = 0;
291 uinfo->value.integer.max = 15; 303 uinfo->value.integer.max = 15;
292 return 0; 304 return 0;
293 } 305 }
294 306
295 static int snd_pmac_burgundy_get_gain(struct s 307 static int snd_pmac_burgundy_get_gain(struct snd_kcontrol *kcontrol,
296 struct s 308 struct snd_ctl_elem_value *ucontrol)
297 { 309 {
298 struct snd_pmac *chip = snd_kcontrol_c 310 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
299 unsigned int addr = BASE2ADDR(kcontrol 311 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
300 int stereo = (kcontrol->private_value 312 int stereo = (kcontrol->private_value >> 24) & 1;
301 int atten = (kcontrol->private_value > 313 int atten = (kcontrol->private_value >> 25) & 1;
302 int oval; 314 int oval;
303 315
304 oval = snd_pmac_burgundy_rcb(chip, add 316 oval = snd_pmac_burgundy_rcb(chip, addr);
305 if (atten) 317 if (atten)
306 oval = ~oval & 0xff; 318 oval = ~oval & 0xff;
307 ucontrol->value.integer.value[0] = ova 319 ucontrol->value.integer.value[0] = oval & 0xf;
308 if (stereo) 320 if (stereo)
309 ucontrol->value.integer.value[ 321 ucontrol->value.integer.value[1] = (oval >> 4) & 0xf;
310 return 0; 322 return 0;
311 } 323 }
312 324
313 static int snd_pmac_burgundy_put_gain(struct s 325 static int snd_pmac_burgundy_put_gain(struct snd_kcontrol *kcontrol,
314 struct s 326 struct snd_ctl_elem_value *ucontrol)
315 { 327 {
316 struct snd_pmac *chip = snd_kcontrol_c 328 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
317 unsigned int addr = BASE2ADDR(kcontrol 329 unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
318 int stereo = (kcontrol->private_value 330 int stereo = (kcontrol->private_value >> 24) & 1;
319 int atten = (kcontrol->private_value > 331 int atten = (kcontrol->private_value >> 25) & 1;
320 int oval, val; 332 int oval, val;
321 333
322 oval = snd_pmac_burgundy_rcb(chip, add 334 oval = snd_pmac_burgundy_rcb(chip, addr);
323 if (atten) 335 if (atten)
324 oval = ~oval & 0xff; 336 oval = ~oval & 0xff;
325 val = ucontrol->value.integer.value[0] 337 val = ucontrol->value.integer.value[0];
326 if (stereo) 338 if (stereo)
327 val |= ucontrol->value.integer 339 val |= ucontrol->value.integer.value[1] << 4;
328 else 340 else
329 val |= ucontrol->value.integer 341 val |= ucontrol->value.integer.value[0] << 4;
330 if (atten) 342 if (atten)
331 val = ~val & 0xff; 343 val = ~val & 0xff;
332 snd_pmac_burgundy_wcb(chip, addr, val) 344 snd_pmac_burgundy_wcb(chip, addr, val);
333 return val != oval; 345 return val != oval;
334 } 346 }
335 347
336 #define BURGUNDY_VOLUME_B(xname, xindex, addr, 348 #define BURGUNDY_VOLUME_B(xname, xindex, addr, stereo, atten) \
337 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = 349 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
338 .info = snd_pmac_burgundy_info_gain,\ 350 .info = snd_pmac_burgundy_info_gain,\
339 .get = snd_pmac_burgundy_get_gain,\ 351 .get = snd_pmac_burgundy_get_gain,\
340 .put = snd_pmac_burgundy_put_gain,\ 352 .put = snd_pmac_burgundy_put_gain,\
341 .private_value = (ADDR2BASE(addr) | ((stereo 353 .private_value = (ADDR2BASE(addr) | ((stereo) << 24) | ((atten) << 25)) }
342 354
343 /* 355 /*
344 * Burgundy switch: 0/1, mono/stereo, word reg 356 * Burgundy switch: 0/1, mono/stereo, word reg
345 */ 357 */
346 static int snd_pmac_burgundy_info_switch_w(str 358 static int snd_pmac_burgundy_info_switch_w(struct snd_kcontrol *kcontrol,
347 str 359 struct snd_ctl_elem_info *uinfo)
348 { 360 {
349 int stereo = (kcontrol->private_value 361 int stereo = (kcontrol->private_value >> 24) & 1;
350 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOL 362 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
351 uinfo->count = stereo + 1; 363 uinfo->count = stereo + 1;
352 uinfo->value.integer.min = 0; 364 uinfo->value.integer.min = 0;
353 uinfo->value.integer.max = 1; 365 uinfo->value.integer.max = 1;
354 return 0; 366 return 0;
355 } 367 }
356 368
357 static int snd_pmac_burgundy_get_switch_w(stru 369 static int snd_pmac_burgundy_get_switch_w(struct snd_kcontrol *kcontrol,
358 stru 370 struct snd_ctl_elem_value *ucontrol)
359 { 371 {
360 struct snd_pmac *chip = snd_kcontrol_c 372 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
361 unsigned int addr = BASE2ADDR((kcontro 373 unsigned int addr = BASE2ADDR((kcontrol->private_value >> 16) & 0xff);
362 int lmask = 1 << (kcontrol->private_va 374 int lmask = 1 << (kcontrol->private_value & 0xff);
363 int rmask = 1 << ((kcontrol->private_v 375 int rmask = 1 << ((kcontrol->private_value >> 8) & 0xff);
364 int stereo = (kcontrol->private_value 376 int stereo = (kcontrol->private_value >> 24) & 1;
365 int val = snd_pmac_burgundy_rcw(chip, 377 int val = snd_pmac_burgundy_rcw(chip, addr);
366 ucontrol->value.integer.value[0] = (va 378 ucontrol->value.integer.value[0] = (val & lmask) ? 1 : 0;
367 if (stereo) 379 if (stereo)
368 ucontrol->value.integer.value[ 380 ucontrol->value.integer.value[1] = (val & rmask) ? 1 : 0;
369 return 0; 381 return 0;
370 } 382 }
371 383
372 static int snd_pmac_burgundy_put_switch_w(stru 384 static int snd_pmac_burgundy_put_switch_w(struct snd_kcontrol *kcontrol,
373 stru 385 struct snd_ctl_elem_value *ucontrol)
374 { 386 {
375 struct snd_pmac *chip = snd_kcontrol_c 387 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
376 unsigned int addr = BASE2ADDR((kcontro 388 unsigned int addr = BASE2ADDR((kcontrol->private_value >> 16) & 0xff);
377 int lmask = 1 << (kcontrol->private_va 389 int lmask = 1 << (kcontrol->private_value & 0xff);
378 int rmask = 1 << ((kcontrol->private_v 390 int rmask = 1 << ((kcontrol->private_value >> 8) & 0xff);
379 int stereo = (kcontrol->private_value 391 int stereo = (kcontrol->private_value >> 24) & 1;
380 int val, oval; 392 int val, oval;
381 oval = snd_pmac_burgundy_rcw(chip, add 393 oval = snd_pmac_burgundy_rcw(chip, addr);
382 val = oval & ~(lmask | (stereo ? rmask 394 val = oval & ~(lmask | (stereo ? rmask : 0));
383 if (ucontrol->value.integer.value[0]) 395 if (ucontrol->value.integer.value[0])
384 val |= lmask; 396 val |= lmask;
385 if (stereo && ucontrol->value.integer. 397 if (stereo && ucontrol->value.integer.value[1])
386 val |= rmask; 398 val |= rmask;
387 snd_pmac_burgundy_wcw(chip, addr, val) 399 snd_pmac_burgundy_wcw(chip, addr, val);
388 return val != oval; 400 return val != oval;
389 } 401 }
390 402
391 #define BURGUNDY_SWITCH_W(xname, xindex, addr, 403 #define BURGUNDY_SWITCH_W(xname, xindex, addr, lbit, rbit, stereo) \
392 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = 404 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
393 .info = snd_pmac_burgundy_info_switch_w,\ 405 .info = snd_pmac_burgundy_info_switch_w,\
394 .get = snd_pmac_burgundy_get_switch_w,\ 406 .get = snd_pmac_burgundy_get_switch_w,\
395 .put = snd_pmac_burgundy_put_switch_w,\ 407 .put = snd_pmac_burgundy_put_switch_w,\
396 .private_value = ((lbit) | ((rbit) << 8)\ 408 .private_value = ((lbit) | ((rbit) << 8)\
397 | (ADDR2BASE(addr) << 16) | (( 409 | (ADDR2BASE(addr) << 16) | ((stereo) << 24)) }
398 410
399 /* 411 /*
400 * Burgundy switch: 0/1, mono/stereo, byte reg 412 * Burgundy switch: 0/1, mono/stereo, byte reg, bit mask
401 */ 413 */
402 static int snd_pmac_burgundy_info_switch_b(str 414 static int snd_pmac_burgundy_info_switch_b(struct snd_kcontrol *kcontrol,
403 str 415 struct snd_ctl_elem_info *uinfo)
404 { 416 {
405 int stereo = (kcontrol->private_value 417 int stereo = (kcontrol->private_value >> 24) & 1;
406 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOL 418 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
407 uinfo->count = stereo + 1; 419 uinfo->count = stereo + 1;
408 uinfo->value.integer.min = 0; 420 uinfo->value.integer.min = 0;
409 uinfo->value.integer.max = 1; 421 uinfo->value.integer.max = 1;
410 return 0; 422 return 0;
411 } 423 }
412 424
413 static int snd_pmac_burgundy_get_switch_b(stru 425 static int snd_pmac_burgundy_get_switch_b(struct snd_kcontrol *kcontrol,
414 stru 426 struct snd_ctl_elem_value *ucontrol)
415 { 427 {
416 struct snd_pmac *chip = snd_kcontrol_c 428 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
417 unsigned int addr = BASE2ADDR((kcontro 429 unsigned int addr = BASE2ADDR((kcontrol->private_value >> 16) & 0xff);
418 int lmask = kcontrol->private_value & 430 int lmask = kcontrol->private_value & 0xff;
419 int rmask = (kcontrol->private_value > 431 int rmask = (kcontrol->private_value >> 8) & 0xff;
420 int stereo = (kcontrol->private_value 432 int stereo = (kcontrol->private_value >> 24) & 1;
421 int val = snd_pmac_burgundy_rcb(chip, 433 int val = snd_pmac_burgundy_rcb(chip, addr);
422 ucontrol->value.integer.value[0] = (va 434 ucontrol->value.integer.value[0] = (val & lmask) ? 1 : 0;
423 if (stereo) 435 if (stereo)
424 ucontrol->value.integer.value[ 436 ucontrol->value.integer.value[1] = (val & rmask) ? 1 : 0;
425 return 0; 437 return 0;
426 } 438 }
427 439
428 static int snd_pmac_burgundy_put_switch_b(stru 440 static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol,
429 stru 441 struct snd_ctl_elem_value *ucontrol)
430 { 442 {
431 struct snd_pmac *chip = snd_kcontrol_c 443 struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
432 unsigned int addr = BASE2ADDR((kcontro 444 unsigned int addr = BASE2ADDR((kcontrol->private_value >> 16) & 0xff);
433 int lmask = kcontrol->private_value & 445 int lmask = kcontrol->private_value & 0xff;
434 int rmask = (kcontrol->private_value > 446 int rmask = (kcontrol->private_value >> 8) & 0xff;
435 int stereo = (kcontrol->private_value 447 int stereo = (kcontrol->private_value >> 24) & 1;
436 int val, oval; 448 int val, oval;
437 oval = snd_pmac_burgundy_rcb(chip, add 449 oval = snd_pmac_burgundy_rcb(chip, addr);
438 val = oval & ~(lmask | rmask); 450 val = oval & ~(lmask | rmask);
439 if (ucontrol->value.integer.value[0]) 451 if (ucontrol->value.integer.value[0])
440 val |= lmask; 452 val |= lmask;
441 if (stereo && ucontrol->value.integer. 453 if (stereo && ucontrol->value.integer.value[1])
442 val |= rmask; 454 val |= rmask;
443 snd_pmac_burgundy_wcb(chip, addr, val) 455 snd_pmac_burgundy_wcb(chip, addr, val);
444 return val != oval; 456 return val != oval;
445 } 457 }
446 458
447 #define BURGUNDY_SWITCH_B(xname, xindex, addr, 459 #define BURGUNDY_SWITCH_B(xname, xindex, addr, lmask, rmask, stereo) \
448 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = 460 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
449 .info = snd_pmac_burgundy_info_switch_b,\ 461 .info = snd_pmac_burgundy_info_switch_b,\
450 .get = snd_pmac_burgundy_get_switch_b,\ 462 .get = snd_pmac_burgundy_get_switch_b,\
451 .put = snd_pmac_burgundy_put_switch_b,\ 463 .put = snd_pmac_burgundy_put_switch_b,\
452 .private_value = ((lmask) | ((rmask) << 8)\ 464 .private_value = ((lmask) | ((rmask) << 8)\
453 | (ADDR2BASE(addr) << 16) | (( 465 | (ADDR2BASE(addr) << 16) | ((stereo) << 24)) }
454 466
455 /* 467 /*
456 * Burgundy mixers 468 * Burgundy mixers
457 */ 469 */
458 static const struct snd_kcontrol_new snd_pmac_ !! 470 static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] = {
459 BURGUNDY_VOLUME_W("Master Playback Vol 471 BURGUNDY_VOLUME_W("Master Playback Volume", 0,
460 MASK_ADDR_BURGUNDY_MAS 472 MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),
461 BURGUNDY_VOLUME_W("CD Capture Volume", 473 BURGUNDY_VOLUME_W("CD Capture Volume", 0,
462 MASK_ADDR_BURGUNDY_VOL 474 MASK_ADDR_BURGUNDY_VOLCD, 16),
463 BURGUNDY_VOLUME_2B("Input Capture Volu 475 BURGUNDY_VOLUME_2B("Input Capture Volume", 0,
464 MASK_ADDR_BURGUNDY_VOL 476 MASK_ADDR_BURGUNDY_VOLMIX01, 2),
465 BURGUNDY_VOLUME_2B("Mixer Playback Vol 477 BURGUNDY_VOLUME_2B("Mixer Playback Volume", 0,
466 MASK_ADDR_BURGUNDY_VOL 478 MASK_ADDR_BURGUNDY_VOLMIX23, 0),
467 BURGUNDY_VOLUME_B("CD Gain Capture Vol 479 BURGUNDY_VOLUME_B("CD Gain Capture Volume", 0,
468 MASK_ADDR_BURGUNDY_GAI 480 MASK_ADDR_BURGUNDY_GAINCD, 1, 0),
469 BURGUNDY_SWITCH_W("Master Capture Swit 481 BURGUNDY_SWITCH_W("Master Capture Switch", 0,
470 MASK_ADDR_BURGUNDY_OUT 482 MASK_ADDR_BURGUNDY_OUTPUTENABLES, 24, 0, 0),
471 BURGUNDY_SWITCH_W("CD Capture Switch", 483 BURGUNDY_SWITCH_W("CD Capture Switch", 0,
472 MASK_ADDR_BURGUNDY_CAP 484 MASK_ADDR_BURGUNDY_CAPTURESELECTS, 0, 16, 1),
473 BURGUNDY_SWITCH_W("CD Playback Switch" 485 BURGUNDY_SWITCH_W("CD Playback Switch", 0,
474 MASK_ADDR_BURGUNDY_OUT 486 MASK_ADDR_BURGUNDY_OUTPUTSELECTS, 0, 16, 1),
475 /* BURGUNDY_SWITCH_W("Loop Capture Switch 487 /* BURGUNDY_SWITCH_W("Loop Capture Switch", 0,
476 * MASK_ADDR_BURGUNDY_CAPTURESELE 488 * MASK_ADDR_BURGUNDY_CAPTURESELECTS, 8, 24, 1),
477 * BURGUNDY_SWITCH_B("Mixer out Capture S 489 * BURGUNDY_SWITCH_B("Mixer out Capture Switch", 0,
478 * MASK_ADDR_BURGUNDY_HOSTIFAD, 0 490 * MASK_ADDR_BURGUNDY_HOSTIFAD, 0x02, 0, 0),
479 * BURGUNDY_SWITCH_B("Mixer Capture Switc 491 * BURGUNDY_SWITCH_B("Mixer Capture Switch", 0,
480 * MASK_ADDR_BURGUNDY_HOSTIFAD, 0 492 * MASK_ADDR_BURGUNDY_HOSTIFAD, 0x01, 0, 0),
481 * BURGUNDY_SWITCH_B("PCM out Capture Swi 493 * BURGUNDY_SWITCH_B("PCM out Capture Switch", 0,
482 * MASK_ADDR_BURGUNDY_HOSTIFEH, 0 494 * MASK_ADDR_BURGUNDY_HOSTIFEH, 0x02, 0, 0),
483 */ BURGUNDY_SWITCH_B("PCM Capture Switch" 495 */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0,
484 MASK_ADDR_BURGUNDY_HOS 496 MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0)
485 }; 497 };
486 static const struct snd_kcontrol_new snd_pmac_ !! 498 static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] = {
487 BURGUNDY_VOLUME_W("Line in Capture Vol 499 BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
488 MASK_ADDR_BURGUNDY_VOL 500 MASK_ADDR_BURGUNDY_VOLLINE, 16),
489 BURGUNDY_VOLUME_W("Mic Capture Volume" 501 BURGUNDY_VOLUME_W("Mic Capture Volume", 0,
490 MASK_ADDR_BURGUNDY_VOL 502 MASK_ADDR_BURGUNDY_VOLMIC, 16),
491 BURGUNDY_VOLUME_B("Line in Gain Captur 503 BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
492 MASK_ADDR_BURGUNDY_GAI 504 MASK_ADDR_BURGUNDY_GAINLINE, 1, 0),
493 BURGUNDY_VOLUME_B("Mic Gain Capture Vo 505 BURGUNDY_VOLUME_B("Mic Gain Capture Volume", 0,
494 MASK_ADDR_BURGUNDY_GAI 506 MASK_ADDR_BURGUNDY_GAINMIC, 1, 0),
495 BURGUNDY_VOLUME_B("Speaker Playback Vo 507 BURGUNDY_VOLUME_B("Speaker Playback Volume", 0,
496 MASK_ADDR_BURGUNDY_ATT 508 MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1),
497 BURGUNDY_VOLUME_B("Line out Playback V 509 BURGUNDY_VOLUME_B("Line out Playback Volume", 0,
498 MASK_ADDR_BURGUNDY_ATT 510 MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1, 1),
499 BURGUNDY_VOLUME_B("Headphone Playback 511 BURGUNDY_VOLUME_B("Headphone Playback Volume", 0,
500 MASK_ADDR_BURGUNDY_ATT 512 MASK_ADDR_BURGUNDY_ATTENHP, 1, 1),
501 BURGUNDY_SWITCH_W("Line in Capture Swi 513 BURGUNDY_SWITCH_W("Line in Capture Switch", 0,
502 MASK_ADDR_BURGUNDY_CAP 514 MASK_ADDR_BURGUNDY_CAPTURESELECTS, 1, 17, 1),
503 BURGUNDY_SWITCH_W("Mic Capture Switch" 515 BURGUNDY_SWITCH_W("Mic Capture Switch", 0,
504 MASK_ADDR_BURGUNDY_CAP 516 MASK_ADDR_BURGUNDY_CAPTURESELECTS, 2, 18, 1),
505 BURGUNDY_SWITCH_W("Line in Playback Sw 517 BURGUNDY_SWITCH_W("Line in Playback Switch", 0,
506 MASK_ADDR_BURGUNDY_OUT 518 MASK_ADDR_BURGUNDY_OUTPUTSELECTS, 1, 17, 1),
507 BURGUNDY_SWITCH_W("Mic Playback Switch 519 BURGUNDY_SWITCH_W("Mic Playback Switch", 0,
508 MASK_ADDR_BURGUNDY_OUT 520 MASK_ADDR_BURGUNDY_OUTPUTSELECTS, 2, 18, 1),
509 BURGUNDY_SWITCH_B("Mic Boost Capture S 521 BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0,
510 MASK_ADDR_BURGUNDY_INP 522 MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1)
511 }; 523 };
512 static const struct snd_kcontrol_new snd_pmac_ !! 524 static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] = {
513 BURGUNDY_VOLUME_W("Line in Capture Vol 525 BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
514 MASK_ADDR_BURGUNDY_VOL 526 MASK_ADDR_BURGUNDY_VOLMIC, 16),
515 BURGUNDY_VOLUME_B("Line in Gain Captur 527 BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
516 MASK_ADDR_BURGUNDY_GAI 528 MASK_ADDR_BURGUNDY_GAINMIC, 1, 0),
517 BURGUNDY_VOLUME_B("Speaker Playback Vo 529 BURGUNDY_VOLUME_B("Speaker Playback Volume", 0,
518 MASK_ADDR_BURGUNDY_ATT 530 MASK_ADDR_BURGUNDY_ATTENMONO, 0, 1),
519 BURGUNDY_VOLUME_B("Line out Playback V 531 BURGUNDY_VOLUME_B("Line out Playback Volume", 0,
520 MASK_ADDR_BURGUNDY_ATT 532 MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1),
521 BURGUNDY_SWITCH_W("Line in Capture Swi 533 BURGUNDY_SWITCH_W("Line in Capture Switch", 0,
522 MASK_ADDR_BURGUNDY_CAP 534 MASK_ADDR_BURGUNDY_CAPTURESELECTS, 2, 18, 1),
523 BURGUNDY_SWITCH_W("Line in Playback Sw 535 BURGUNDY_SWITCH_W("Line in Playback Switch", 0,
524 MASK_ADDR_BURGUNDY_OUT 536 MASK_ADDR_BURGUNDY_OUTPUTSELECTS, 2, 18, 1),
525 /* BURGUNDY_SWITCH_B("Line in Boost Captu 537 /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0,
526 * MASK_ADDR_BURGUNDY_INPBOOST, 0 538 * MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */
527 }; 539 };
528 static const struct snd_kcontrol_new snd_pmac_ !! 540 static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac =
529 BURGUNDY_SWITCH_B("Master Playback Switch", 0, 541 BURGUNDY_SWITCH_B("Master Playback Switch", 0,
530 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 542 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
531 BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOU 543 BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT,
532 BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEO 544 BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1);
533 static const struct snd_kcontrol_new snd_pmac_ !! 545 static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac =
534 BURGUNDY_SWITCH_B("Master Playback Switch", 0, 546 BURGUNDY_SWITCH_B("Master Playback Switch", 0,
535 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 547 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
536 BURGUNDY_OUTPUT_INTERN 548 BURGUNDY_OUTPUT_INTERN
537 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPU 549 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
538 static const struct snd_kcontrol_new snd_pmac_ !! 550 static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac =
539 BURGUNDY_SWITCH_B("Speaker Playback Switch", 0 551 BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,
540 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 552 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
541 BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_ 553 BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
542 static const struct snd_kcontrol_new snd_pmac_ !! 554 static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac =
543 BURGUNDY_SWITCH_B("Speaker Playback Switch", 0 555 BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,
544 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 556 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
545 BURGUNDY_OUTPUT_INTERN, 0, 0); 557 BURGUNDY_OUTPUT_INTERN, 0, 0);
546 static const struct snd_kcontrol_new snd_pmac_ !! 558 static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac =
547 BURGUNDY_SWITCH_B("Line out Playback Switch", 559 BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
548 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 560 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
549 BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOU 561 BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1);
550 static const struct snd_kcontrol_new snd_pmac_ !! 562 static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac =
551 BURGUNDY_SWITCH_B("Line out Playback Switch", 563 BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
552 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 564 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
553 BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_ 565 BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
554 static const struct snd_kcontrol_new snd_pmac_ !! 566 static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac =
555 BURGUNDY_SWITCH_B("Headphone Playback Switch", 567 BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,
556 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 568 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
557 BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1 569 BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1);
558 570
559 571
560 #ifdef PMAC_SUPPORT_AUTOMUTE 572 #ifdef PMAC_SUPPORT_AUTOMUTE
561 /* 573 /*
562 * auto-mute stuffs 574 * auto-mute stuffs
563 */ 575 */
564 static int snd_pmac_burgundy_detect_headphone( 576 static int snd_pmac_burgundy_detect_headphone(struct snd_pmac *chip)
565 { 577 {
566 return (in_le32(&chip->awacs->codec_st 578 return (in_le32(&chip->awacs->codec_stat) & chip->hp_stat_mask) ? 1 : 0;
567 } 579 }
568 580
569 static void snd_pmac_burgundy_update_automute( 581 static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_notify)
570 { 582 {
571 if (chip->auto_mute) { 583 if (chip->auto_mute) {
572 int imac = of_machine_is_compa 584 int imac = of_machine_is_compatible("iMac");
573 int reg, oreg; 585 int reg, oreg;
574 reg = oreg = snd_pmac_burgundy 586 reg = oreg = snd_pmac_burgundy_rcb(chip,
575 MASK_ADDR_BURG 587 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES);
576 reg &= imac ? ~(BURGUNDY_OUTPU 588 reg &= imac ? ~(BURGUNDY_OUTPUT_LEFT | BURGUNDY_OUTPUT_RIGHT
577 | BURGUNDY_HP_ 589 | BURGUNDY_HP_LEFT | BURGUNDY_HP_RIGHT)
578 : ~(BURGUNDY_OUTPUT_LE 590 : ~(BURGUNDY_OUTPUT_LEFT | BURGUNDY_OUTPUT_RIGHT
579 | BURGUNDY_OUT 591 | BURGUNDY_OUTPUT_INTERN);
580 if (snd_pmac_burgundy_detect_h 592 if (snd_pmac_burgundy_detect_headphone(chip))
581 reg |= imac ? (BURGUND 593 reg |= imac ? (BURGUNDY_HP_LEFT | BURGUNDY_HP_RIGHT)
582 : (BURGUNDY_OU 594 : (BURGUNDY_OUTPUT_LEFT
583 | BURG 595 | BURGUNDY_OUTPUT_RIGHT);
584 else 596 else
585 reg |= imac ? (BURGUND 597 reg |= imac ? (BURGUNDY_OUTPUT_LEFT
586 | BURG 598 | BURGUNDY_OUTPUT_RIGHT)
587 : (BURGUNDY_OU 599 : (BURGUNDY_OUTPUT_INTERN);
588 if (do_notify && reg == oreg) 600 if (do_notify && reg == oreg)
589 return; 601 return;
590 snd_pmac_burgundy_wcb(chip, 602 snd_pmac_burgundy_wcb(chip,
591 MASK_ADDR_BURG 603 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, reg);
592 if (do_notify) { 604 if (do_notify) {
593 snd_ctl_notify(chip->c 605 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
594 &chip-> 606 &chip->master_sw_ctl->id);
595 snd_ctl_notify(chip->c 607 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
596 &chip-> 608 &chip->speaker_sw_ctl->id);
597 snd_ctl_notify(chip->c 609 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
598 &chip-> 610 &chip->hp_detect_ctl->id);
599 } 611 }
600 } 612 }
601 } 613 }
602 #endif /* PMAC_SUPPORT_AUTOMUTE */ 614 #endif /* PMAC_SUPPORT_AUTOMUTE */
603 615
604 616
605 /* 617 /*
606 * initialize burgundy 618 * initialize burgundy
607 */ 619 */
608 int snd_pmac_burgundy_init(struct snd_pmac *ch 620 int snd_pmac_burgundy_init(struct snd_pmac *chip)
609 { 621 {
610 int imac = of_machine_is_compatible("i 622 int imac = of_machine_is_compatible("iMac");
611 int i, err; 623 int i, err;
612 624
613 /* Checks to see the chip is alive and 625 /* Checks to see the chip is alive and kicking */
614 if ((in_le32(&chip->awacs->codec_ctrl) 626 if ((in_le32(&chip->awacs->codec_ctrl) & MASK_ERRCODE) == 0xf0000) {
615 printk(KERN_WARNING "pmac burg 627 printk(KERN_WARNING "pmac burgundy: disabled by MacOS :-(\n");
616 return 1; 628 return 1;
617 } 629 }
618 630
619 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 631 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_OUTPUTENABLES,
620 DEF_BURGUNDY_OUTPUT 632 DEF_BURGUNDY_OUTPUTENABLES);
621 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 633 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
622 DEF_BURGUNDY_MORE_O 634 DEF_BURGUNDY_MORE_OUTPUTENABLES);
623 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 635 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_OUTPUTSELECTS,
624 DEF_BURGUNDY_OUTPUT 636 DEF_BURGUNDY_OUTPUTSELECTS);
625 637
626 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 638 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_INPSEL21,
627 DEF_BURGUNDY_INPSEL 639 DEF_BURGUNDY_INPSEL21);
628 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 640 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_INPSEL3,
629 imac ? DEF_BURGUNDY 641 imac ? DEF_BURGUNDY_INPSEL3_IMAC
630 : DEF_BURGUNDY_INPS 642 : DEF_BURGUNDY_INPSEL3_PMAC);
631 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 643 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_GAINCD,
632 DEF_BURGUNDY_GAINCD 644 DEF_BURGUNDY_GAINCD);
633 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 645 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_GAINLINE,
634 DEF_BURGUNDY_GAINLI 646 DEF_BURGUNDY_GAINLINE);
635 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 647 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_GAINMIC,
636 DEF_BURGUNDY_GAINMI 648 DEF_BURGUNDY_GAINMIC);
637 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 649 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_GAINMODEM,
638 DEF_BURGUNDY_GAINMO 650 DEF_BURGUNDY_GAINMODEM);
639 651
640 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 652 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_ATTENSPEAKER,
641 DEF_BURGUNDY_ATTENS 653 DEF_BURGUNDY_ATTENSPEAKER);
642 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 654 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_ATTENLINEOUT,
643 DEF_BURGUNDY_ATTENL 655 DEF_BURGUNDY_ATTENLINEOUT);
644 snd_pmac_burgundy_wcb(chip, MASK_ADDR_ 656 snd_pmac_burgundy_wcb(chip, MASK_ADDR_BURGUNDY_ATTENHP,
645 DEF_BURGUNDY_ATTENH 657 DEF_BURGUNDY_ATTENHP);
646 658
647 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 659 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_MASTER_VOLUME,
648 DEF_BURGUNDY_MASTER 660 DEF_BURGUNDY_MASTER_VOLUME);
649 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 661 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_VOLCD,
650 DEF_BURGUNDY_VOLCD) 662 DEF_BURGUNDY_VOLCD);
651 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 663 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_VOLLINE,
652 DEF_BURGUNDY_VOLLIN 664 DEF_BURGUNDY_VOLLINE);
653 snd_pmac_burgundy_wcw(chip, MASK_ADDR_ 665 snd_pmac_burgundy_wcw(chip, MASK_ADDR_BURGUNDY_VOLMIC,
654 DEF_BURGUNDY_VOLMIC 666 DEF_BURGUNDY_VOLMIC);
655 667
656 if (chip->hp_stat_mask == 0) { 668 if (chip->hp_stat_mask == 0) {
657 /* set headphone-jack detectio 669 /* set headphone-jack detection bit */
658 if (imac) 670 if (imac)
659 chip->hp_stat_mask = B 671 chip->hp_stat_mask = BURGUNDY_HPDETECT_IMAC_UPPER
660 | BURGUNDY_HPD 672 | BURGUNDY_HPDETECT_IMAC_LOWER
661 | BURGUNDY_HPD 673 | BURGUNDY_HPDETECT_IMAC_SIDE;
662 else 674 else
663 chip->hp_stat_mask = B 675 chip->hp_stat_mask = BURGUNDY_HPDETECT_PMAC_BACK;
664 } 676 }
665 /* 677 /*
666 * build burgundy mixers 678 * build burgundy mixers
667 */ 679 */
668 strcpy(chip->card->mixername, "PowerMa 680 strcpy(chip->card->mixername, "PowerMac Burgundy");
669 681
670 for (i = 0; i < ARRAY_SIZE(snd_pmac_bu 682 for (i = 0; i < ARRAY_SIZE(snd_pmac_burgundy_mixers); i++) {
671 err = snd_ctl_add(chip->card, 683 err = snd_ctl_add(chip->card,
672 snd_ctl_new1(&snd_pmac_bur 684 snd_ctl_new1(&snd_pmac_burgundy_mixers[i], chip));
673 if (err < 0) 685 if (err < 0)
674 return err; 686 return err;
675 } 687 }
676 for (i = 0; i < (imac ? ARRAY_SIZE(snd 688 for (i = 0; i < (imac ? ARRAY_SIZE(snd_pmac_burgundy_mixers_imac)
677 : ARRAY_SIZE(snd_pmac_ 689 : ARRAY_SIZE(snd_pmac_burgundy_mixers_pmac)); i++) {
678 err = snd_ctl_add(chip->card, 690 err = snd_ctl_add(chip->card,
679 snd_ctl_new1(imac ? &snd_p 691 snd_ctl_new1(imac ? &snd_pmac_burgundy_mixers_imac[i]
680 : &snd_pmac_burgundy_mixer 692 : &snd_pmac_burgundy_mixers_pmac[i], chip));
681 if (err < 0) 693 if (err < 0)
682 return err; 694 return err;
683 } 695 }
684 chip->master_sw_ctl = snd_ctl_new1(ima 696 chip->master_sw_ctl = snd_ctl_new1(imac
685 ? &snd_pmac_burgundy_m 697 ? &snd_pmac_burgundy_master_sw_imac
686 : &snd_pmac_burgundy_m 698 : &snd_pmac_burgundy_master_sw_pmac, chip);
687 err = snd_ctl_add(chip->card, chip->ma 699 err = snd_ctl_add(chip->card, chip->master_sw_ctl);
688 if (err < 0) 700 if (err < 0)
689 return err; 701 return err;
690 chip->master_sw_ctl = snd_ctl_new1(ima 702 chip->master_sw_ctl = snd_ctl_new1(imac
691 ? &snd_pmac_burgundy_l 703 ? &snd_pmac_burgundy_line_sw_imac
692 : &snd_pmac_burgundy_l 704 : &snd_pmac_burgundy_line_sw_pmac, chip);
693 err = snd_ctl_add(chip->card, chip->ma 705 err = snd_ctl_add(chip->card, chip->master_sw_ctl);
694 if (err < 0) 706 if (err < 0)
695 return err; 707 return err;
696 if (imac) { 708 if (imac) {
697 chip->master_sw_ctl = snd_ctl_ 709 chip->master_sw_ctl = snd_ctl_new1(
698 &snd_pmac_burg 710 &snd_pmac_burgundy_hp_sw_imac, chip);
699 err = snd_ctl_add(chip->card, 711 err = snd_ctl_add(chip->card, chip->master_sw_ctl);
700 if (err < 0) 712 if (err < 0)
701 return err; 713 return err;
702 } 714 }
703 chip->speaker_sw_ctl = snd_ctl_new1(im 715 chip->speaker_sw_ctl = snd_ctl_new1(imac
704 ? &snd_pmac_burgundy_s 716 ? &snd_pmac_burgundy_speaker_sw_imac
705 : &snd_pmac_burgundy_s 717 : &snd_pmac_burgundy_speaker_sw_pmac, chip);
706 err = snd_ctl_add(chip->card, chip->sp 718 err = snd_ctl_add(chip->card, chip->speaker_sw_ctl);
707 if (err < 0) 719 if (err < 0)
708 return err; 720 return err;
709 #ifdef PMAC_SUPPORT_AUTOMUTE 721 #ifdef PMAC_SUPPORT_AUTOMUTE
710 err = snd_pmac_add_automute(chip); 722 err = snd_pmac_add_automute(chip);
711 if (err < 0) 723 if (err < 0)
712 return err; 724 return err;
713 725
714 chip->detect_headphone = snd_pmac_burg 726 chip->detect_headphone = snd_pmac_burgundy_detect_headphone;
715 chip->update_automute = snd_pmac_burgu 727 chip->update_automute = snd_pmac_burgundy_update_automute;
716 snd_pmac_burgundy_update_automute(chip 728 snd_pmac_burgundy_update_automute(chip, 0); /* update the status only */
717 #endif 729 #endif
718 730
719 return 0; 731 return 0;
720 } 732 }
721 733
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.