Diff markup
1 /* 1 /*
2 * ALSA SoC TLV320AIC3X codec driver 2 * ALSA SoC TLV320AIC3X codec driver
3 * 3 *
4 * Author: Vladimir Barinov, <vbarinov@ru 4 * Author: Vladimir Barinov, <vbarinov@ru.mvista.com>
5 * Copyright: (C) 2007 MontaVista Software, 5 * Copyright: (C) 2007 MontaVista Software, Inc., <source@mvista.com>
6 * 6 *
7 * Based on sound/soc/codecs/wm8753.c by Liam 7 * Based on sound/soc/codecs/wm8753.c by Liam Girdwood
8 * 8 *
9 * This program is free software; you can redi 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Publi 10 * it under the terms of the GNU General Public License version 2 as
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12 * 12 *
13 * Notes: 13 * Notes:
14 * The AIC3X is a driver for a low power ster 14 * The AIC3X is a driver for a low power stereo audio
15 * codecs aic31, aic32, aic33. 15 * codecs aic31, aic32, aic33.
16 * 16 *
17 * It supports full aic33 codec functionality 17 * It supports full aic33 codec functionality.
18 * The compatibility with aic32, aic31 is as 18 * The compatibility with aic32, aic31 is as follows:
19 * aic32 | aic31 19 * aic32 | aic31
20 * --------------------------------------- 20 * ---------------------------------------
21 * MONO_LOUT -> N/A | MONO_LOUT -> N/A 21 * MONO_LOUT -> N/A | MONO_LOUT -> N/A
22 * | IN1L -> LINE1L 22 * | IN1L -> LINE1L
23 * | IN1R -> LINE1R 23 * | IN1R -> LINE1R
24 * | IN2L -> LINE2L 24 * | IN2L -> LINE2L
25 * | IN2R -> LINE2R 25 * | IN2R -> LINE2R
26 * | MIC3L/R -> N/A 26 * | MIC3L/R -> N/A
27 * truncated internal functionality in 27 * truncated internal functionality in
28 * accordance with documentation 28 * accordance with documentation
29 * --------------------------------------- 29 * ---------------------------------------
30 * 30 *
31 * Hence the machine layer should disable uns 31 * Hence the machine layer should disable unsupported inputs/outputs by
32 * snd_soc_dapm_set_endpoint(codec, "MONO_LOU 32 * snd_soc_dapm_set_endpoint(codec, "MONO_LOUT", 0), etc.
33 */ 33 */
34 34
35 #include <linux/module.h> 35 #include <linux/module.h>
36 #include <linux/moduleparam.h> 36 #include <linux/moduleparam.h>
37 #include <linux/init.h> 37 #include <linux/init.h>
38 #include <linux/delay.h> 38 #include <linux/delay.h>
39 #include <linux/pm.h> 39 #include <linux/pm.h>
40 #include <linux/i2c.h> 40 #include <linux/i2c.h>
41 #include <linux/platform_device.h> 41 #include <linux/platform_device.h>
42 #include <sound/core.h> 42 #include <sound/core.h>
43 #include <sound/pcm.h> 43 #include <sound/pcm.h>
44 #include <sound/pcm_params.h> 44 #include <sound/pcm_params.h>
45 #include <sound/soc.h> 45 #include <sound/soc.h>
46 #include <sound/soc-dapm.h> 46 #include <sound/soc-dapm.h>
47 #include <sound/initval.h> 47 #include <sound/initval.h>
48 48
49 #include "tlv320aic3x.h" 49 #include "tlv320aic3x.h"
50 50
51 #define AUDIO_NAME "aic3x" 51 #define AUDIO_NAME "aic3x"
52 #define AIC3X_VERSION "0.1" 52 #define AIC3X_VERSION "0.1"
53 53
54 /* codec private data */ 54 /* codec private data */
55 struct aic3x_priv { 55 struct aic3x_priv {
56 unsigned int sysclk; 56 unsigned int sysclk;
57 int master; 57 int master;
58 }; 58 };
59 59
60 /* 60 /*
61 * AIC3X register cache 61 * AIC3X register cache
62 * We can't read the AIC3X register space when 62 * We can't read the AIC3X register space when we are
63 * using 2 wire for device control, so we cach 63 * using 2 wire for device control, so we cache them instead.
64 * There is no point in caching the reset regi 64 * There is no point in caching the reset register
65 */ 65 */
66 static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = 66 static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {
67 0x00, 0x00, 0x00, 0x10, /* 0 */ 67 0x00, 0x00, 0x00, 0x10, /* 0 */
68 0x04, 0x00, 0x00, 0x00, /* 4 */ 68 0x04, 0x00, 0x00, 0x00, /* 4 */
69 0x00, 0x00, 0x00, 0x01, /* 8 */ 69 0x00, 0x00, 0x00, 0x01, /* 8 */
70 0x00, 0x00, 0x00, 0x80, /* 12 */ 70 0x00, 0x00, 0x00, 0x80, /* 12 */
71 0x80, 0xff, 0xff, 0x78, /* 16 */ 71 0x80, 0xff, 0xff, 0x78, /* 16 */
72 0x78, 0x78, 0x78, 0x78, /* 20 */ 72 0x78, 0x78, 0x78, 0x78, /* 20 */
73 0x78, 0x00, 0x00, 0xfe, /* 24 */ 73 0x78, 0x00, 0x00, 0xfe, /* 24 */
74 0x00, 0x00, 0xfe, 0x00, /* 28 */ 74 0x00, 0x00, 0xfe, 0x00, /* 28 */
75 0x18, 0x18, 0x00, 0x00, /* 32 */ 75 0x18, 0x18, 0x00, 0x00, /* 32 */
76 0x00, 0x00, 0x00, 0x00, /* 36 */ 76 0x00, 0x00, 0x00, 0x00, /* 36 */
77 0x00, 0x00, 0x00, 0x80, /* 40 */ 77 0x00, 0x00, 0x00, 0x80, /* 40 */
78 0x80, 0x00, 0x00, 0x00, /* 44 */ 78 0x80, 0x00, 0x00, 0x00, /* 44 */
79 0x00, 0x00, 0x00, 0x04, /* 48 */ 79 0x00, 0x00, 0x00, 0x04, /* 48 */
80 0x00, 0x00, 0x00, 0x00, /* 52 */ 80 0x00, 0x00, 0x00, 0x00, /* 52 */
81 0x00, 0x00, 0x04, 0x00, /* 56 */ 81 0x00, 0x00, 0x04, 0x00, /* 56 */
82 0x00, 0x00, 0x00, 0x00, /* 60 */ 82 0x00, 0x00, 0x00, 0x00, /* 60 */
83 0x00, 0x04, 0x00, 0x00, /* 64 */ 83 0x00, 0x04, 0x00, 0x00, /* 64 */
84 0x00, 0x00, 0x00, 0x00, /* 68 */ 84 0x00, 0x00, 0x00, 0x00, /* 68 */
85 0x04, 0x00, 0x00, 0x00, /* 72 */ 85 0x04, 0x00, 0x00, 0x00, /* 72 */
86 0x00, 0x00, 0x00, 0x00, /* 76 */ 86 0x00, 0x00, 0x00, 0x00, /* 76 */
87 0x00, 0x00, 0x00, 0x00, /* 80 */ 87 0x00, 0x00, 0x00, 0x00, /* 80 */
88 0x00, 0x00, 0x00, 0x00, /* 84 */ 88 0x00, 0x00, 0x00, 0x00, /* 84 */
89 0x00, 0x00, 0x00, 0x00, /* 88 */ 89 0x00, 0x00, 0x00, 0x00, /* 88 */
90 0x00, 0x00, 0x00, 0x00, /* 92 */ 90 0x00, 0x00, 0x00, 0x00, /* 92 */
91 0x00, 0x00, 0x00, 0x00, /* 96 */ 91 0x00, 0x00, 0x00, 0x00, /* 96 */
92 0x00, 0x00, 0x02, /* 100 */ 92 0x00, 0x00, 0x02, /* 100 */
93 }; 93 };
94 94
95 /* 95 /*
96 * read aic3x register cache 96 * read aic3x register cache
97 */ 97 */
98 static inline unsigned int aic3x_read_reg_cach 98 static inline unsigned int aic3x_read_reg_cache(struct snd_soc_codec *codec,
99 99 unsigned int reg)
100 { 100 {
101 u8 *cache = codec->reg_cache; 101 u8 *cache = codec->reg_cache;
102 if (reg >= AIC3X_CACHEREGNUM) 102 if (reg >= AIC3X_CACHEREGNUM)
103 return -1; 103 return -1;
104 return cache[reg]; 104 return cache[reg];
105 } 105 }
106 106
107 /* 107 /*
108 * write aic3x register cache 108 * write aic3x register cache
109 */ 109 */
110 static inline void aic3x_write_reg_cache(struc 110 static inline void aic3x_write_reg_cache(struct snd_soc_codec *codec,
111 u8 re 111 u8 reg, u8 value)
112 { 112 {
113 u8 *cache = codec->reg_cache; 113 u8 *cache = codec->reg_cache;
114 if (reg >= AIC3X_CACHEREGNUM) 114 if (reg >= AIC3X_CACHEREGNUM)
115 return; 115 return;
116 cache[reg] = value; 116 cache[reg] = value;
117 } 117 }
118 118
119 /* 119 /*
120 * write to the aic3x register space 120 * write to the aic3x register space
121 */ 121 */
122 static int aic3x_write(struct snd_soc_codec *c 122 static int aic3x_write(struct snd_soc_codec *codec, unsigned int reg,
123 unsigned int value) 123 unsigned int value)
124 { 124 {
125 u8 data[2]; 125 u8 data[2];
126 126
127 /* data is 127 /* data is
128 * D15..D8 aic3x register offset 128 * D15..D8 aic3x register offset
129 * D7...D0 register data 129 * D7...D0 register data
130 */ 130 */
131 data[0] = reg & 0xff; 131 data[0] = reg & 0xff;
132 data[1] = value & 0xff; 132 data[1] = value & 0xff;
133 133
134 aic3x_write_reg_cache(codec, data[0], 134 aic3x_write_reg_cache(codec, data[0], data[1]);
135 if (codec->hw_write(codec->control_dat 135 if (codec->hw_write(codec->control_data, data, 2) == 2)
136 return 0; 136 return 0;
137 else 137 else
138 return -EIO; 138 return -EIO;
139 } 139 }
140 140
141 #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shif 141 #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \
142 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, . 142 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
143 .info = snd_soc_info_volsw, \ 143 .info = snd_soc_info_volsw, \
144 .get = snd_soc_dapm_get_volsw, .put = 144 .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw_aic3x, \
145 .private_value = SOC_SINGLE_VALUE(reg 145 .private_value = SOC_SINGLE_VALUE(reg, shift, mask, invert) }
146 146
147 /* 147 /*
148 * All input lines are connected when !0xf and 148 * All input lines are connected when !0xf and disconnected with 0xf bit field,
149 * so we have to use specific dapm_put call fo 149 * so we have to use specific dapm_put call for input mixer
150 */ 150 */
151 static int snd_soc_dapm_put_volsw_aic3x(struct 151 static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
152 struct 152 struct snd_ctl_elem_value *ucontrol)
153 { 153 {
154 struct snd_soc_dapm_widget *widget = s 154 struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
155 int reg = kcontrol->private_value & 0x 155 int reg = kcontrol->private_value & 0xff;
156 int shift = (kcontrol->private_value > 156 int shift = (kcontrol->private_value >> 8) & 0x0f;
157 int mask = (kcontrol->private_value >> 157 int mask = (kcontrol->private_value >> 16) & 0xff;
158 int invert = (kcontrol->private_value 158 int invert = (kcontrol->private_value >> 24) & 0x01;
159 unsigned short val, val_mask; 159 unsigned short val, val_mask;
160 int ret; 160 int ret;
161 struct snd_soc_dapm_path *path; 161 struct snd_soc_dapm_path *path;
162 int found = 0; 162 int found = 0;
163 163
164 val = (ucontrol->value.integer.value[0 164 val = (ucontrol->value.integer.value[0] & mask);
165 165
166 mask = 0xf; 166 mask = 0xf;
167 if (val) 167 if (val)
168 val = mask; 168 val = mask;
169 169
170 if (invert) 170 if (invert)
171 val = mask - val; 171 val = mask - val;
172 val_mask = mask << shift; 172 val_mask = mask << shift;
173 val = val << shift; 173 val = val << shift;
174 174
175 mutex_lock(&widget->codec->mutex); 175 mutex_lock(&widget->codec->mutex);
176 176
177 if (snd_soc_test_bits(widget->codec, r 177 if (snd_soc_test_bits(widget->codec, reg, val_mask, val)) {
178 /* find dapm widget path assoc 178 /* find dapm widget path assoc with kcontrol */
179 list_for_each_entry(path, &wid 179 list_for_each_entry(path, &widget->codec->dapm_paths, list) {
180 if (path->kcontrol != 180 if (path->kcontrol != kcontrol)
181 continue; 181 continue;
182 182
183 /* found, now check ty 183 /* found, now check type */
184 found = 1; 184 found = 1;
185 if (val) 185 if (val)
186 /* new connect 186 /* new connection */
187 path->connect 187 path->connect = invert ? 0 : 1;
188 else 188 else
189 /* old connect 189 /* old connection must be powered down */
190 path->connect 190 path->connect = invert ? 1 : 0;
191 break; 191 break;
192 } 192 }
193 193
194 if (found) 194 if (found)
195 snd_soc_dapm_sync_endp 195 snd_soc_dapm_sync_endpoints(widget->codec);
196 } 196 }
197 197
198 ret = snd_soc_update_bits(widget->code 198 ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
199 199
200 mutex_unlock(&widget->codec->mutex); 200 mutex_unlock(&widget->codec->mutex);
201 return ret; 201 return ret;
202 } 202 }
203 203
204 static const char *aic3x_left_dac_mux[] = { "D 204 static const char *aic3x_left_dac_mux[] = { "DAC_L1", "DAC_L3", "DAC_L2" };
205 static const char *aic3x_right_dac_mux[] = { " 205 static const char *aic3x_right_dac_mux[] = { "DAC_R1", "DAC_R3", "DAC_R2" };
206 static const char *aic3x_left_hpcom_mux[] = 206 static const char *aic3x_left_hpcom_mux[] =
207 { "differential of HPLOUT", "constant VCM" 207 { "differential of HPLOUT", "constant VCM", "single-ended" };
208 static const char *aic3x_right_hpcom_mux[] = 208 static const char *aic3x_right_hpcom_mux[] =
209 { "differential of HPROUT", "constant VCM" 209 { "differential of HPROUT", "constant VCM", "single-ended",
210 "differential of HPLCOM", "external feed 210 "differential of HPLCOM", "external feedback" };
211 static const char *aic3x_linein_mode_mux[] = { 211 static const char *aic3x_linein_mode_mux[] = { "single-ended", "differential" };
212 212
213 #define LDAC_ENUM 0 213 #define LDAC_ENUM 0
214 #define RDAC_ENUM 1 214 #define RDAC_ENUM 1
215 #define LHPCOM_ENUM 2 215 #define LHPCOM_ENUM 2
216 #define RHPCOM_ENUM 3 216 #define RHPCOM_ENUM 3
217 #define LINE1L_ENUM 4 217 #define LINE1L_ENUM 4
218 #define LINE1R_ENUM 5 218 #define LINE1R_ENUM 5
219 #define LINE2L_ENUM 6 219 #define LINE2L_ENUM 6
220 #define LINE2R_ENUM 7 220 #define LINE2R_ENUM 7
221 221
222 static const struct soc_enum aic3x_enum[] = { 222 static const struct soc_enum aic3x_enum[] = {
223 SOC_ENUM_SINGLE(DAC_LINE_MUX, 6, 3, ai 223 SOC_ENUM_SINGLE(DAC_LINE_MUX, 6, 3, aic3x_left_dac_mux),
224 SOC_ENUM_SINGLE(DAC_LINE_MUX, 4, 3, ai 224 SOC_ENUM_SINGLE(DAC_LINE_MUX, 4, 3, aic3x_right_dac_mux),
225 SOC_ENUM_SINGLE(HPLCOM_CFG, 4, 3, aic3 225 SOC_ENUM_SINGLE(HPLCOM_CFG, 4, 3, aic3x_left_hpcom_mux),
226 SOC_ENUM_SINGLE(HPRCOM_CFG, 3, 5, aic3 226 SOC_ENUM_SINGLE(HPRCOM_CFG, 3, 5, aic3x_right_hpcom_mux),
227 SOC_ENUM_SINGLE(LINE1L_2_LADC_CTRL, 7, 227 SOC_ENUM_SINGLE(LINE1L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux),
228 SOC_ENUM_SINGLE(LINE1R_2_RADC_CTRL, 7, 228 SOC_ENUM_SINGLE(LINE1R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux),
229 SOC_ENUM_SINGLE(LINE2L_2_LADC_CTRL, 7, 229 SOC_ENUM_SINGLE(LINE2L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux),
230 SOC_ENUM_SINGLE(LINE2R_2_RADC_CTRL, 7, 230 SOC_ENUM_SINGLE(LINE2R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux),
231 }; 231 };
232 232
233 static const struct snd_kcontrol_new aic3x_snd 233 static const struct snd_kcontrol_new aic3x_snd_controls[] = {
234 /* Output */ 234 /* Output */
235 SOC_DOUBLE_R("PCM Playback Volume", LD 235 SOC_DOUBLE_R("PCM Playback Volume", LDAC_VOL, RDAC_VOL, 0, 0x7f, 1),
236 236
237 SOC_DOUBLE_R("Line DAC Playback Volume 237 SOC_DOUBLE_R("Line DAC Playback Volume", DACL1_2_LLOPM_VOL,
238 DACR1_2_RLOPM_VOL, 0, 0x7 238 DACR1_2_RLOPM_VOL, 0, 0x7f, 1),
239 SOC_DOUBLE_R("Line DAC Playback Switch 239 SOC_DOUBLE_R("Line DAC Playback Switch", LLOPM_CTRL, RLOPM_CTRL, 3,
240 0x01, 0), 240 0x01, 0),
241 SOC_DOUBLE_R("Line PGA Bypass Playback 241 SOC_DOUBLE_R("Line PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL,
242 PGAR_2_RLOPM_VOL, 0, 0x7f 242 PGAR_2_RLOPM_VOL, 0, 0x7f, 1),
243 SOC_DOUBLE_R("Line Line2 Bypass Playba 243 SOC_DOUBLE_R("Line Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL,
244 LINE2R_2_RLOPM_VOL, 0, 0x 244 LINE2R_2_RLOPM_VOL, 0, 0x7f, 1),
245 245
246 SOC_DOUBLE_R("Mono DAC Playback Volume 246 SOC_DOUBLE_R("Mono DAC Playback Volume", DACL1_2_MONOLOPM_VOL,
247 DACR1_2_MONOLOPM_VOL, 0, 247 DACR1_2_MONOLOPM_VOL, 0, 0x7f, 1),
248 SOC_SINGLE("Mono DAC Playback Switch", 248 SOC_SINGLE("Mono DAC Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),
249 SOC_DOUBLE_R("Mono PGA Bypass Playback 249 SOC_DOUBLE_R("Mono PGA Bypass Playback Volume", PGAL_2_MONOLOPM_VOL,
250 PGAR_2_MONOLOPM_VOL, 0, 0 250 PGAR_2_MONOLOPM_VOL, 0, 0x7f, 1),
251 SOC_DOUBLE_R("Mono Line2 Bypass Playba 251 SOC_DOUBLE_R("Mono Line2 Bypass Playback Volume", LINE2L_2_MONOLOPM_VOL,
252 LINE2R_2_MONOLOPM_VOL, 0, 252 LINE2R_2_MONOLOPM_VOL, 0, 0x7f, 1),
253 253
254 SOC_DOUBLE_R("HP DAC Playback Volume", 254 SOC_DOUBLE_R("HP DAC Playback Volume", DACL1_2_HPLOUT_VOL,
255 DACR1_2_HPROUT_VOL, 0, 0x 255 DACR1_2_HPROUT_VOL, 0, 0x7f, 1),
256 SOC_DOUBLE_R("HP DAC Playback Switch", 256 SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
257 0x01, 0), 257 0x01, 0),
258 SOC_DOUBLE_R("HP PGA Bypass Playback V 258 SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_2_HPLOUT_VOL,
259 PGAR_2_HPROUT_VOL, 0, 0x7 259 PGAR_2_HPROUT_VOL, 0, 0x7f, 1),
260 SOC_DOUBLE_R("HP Line2 Bypass Playback 260 SOC_DOUBLE_R("HP Line2 Bypass Playback Volume", LINE2L_2_HPLOUT_VOL,
261 LINE2R_2_HPROUT_VOL, 0, 0 261 LINE2R_2_HPROUT_VOL, 0, 0x7f, 1),
262 262
263 SOC_DOUBLE_R("HPCOM DAC Playback Volum 263 SOC_DOUBLE_R("HPCOM DAC Playback Volume", DACL1_2_HPLCOM_VOL,
264 DACR1_2_HPRCOM_VOL, 0, 0x 264 DACR1_2_HPRCOM_VOL, 0, 0x7f, 1),
265 SOC_DOUBLE_R("HPCOM DAC Playback Switc 265 SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
266 0x01, 0), 266 0x01, 0),
267 SOC_DOUBLE_R("HPCOM PGA Bypass Playbac 267 SOC_DOUBLE_R("HPCOM PGA Bypass Playback Volume", PGAL_2_HPLCOM_VOL,
268 PGAR_2_HPRCOM_VOL, 0, 0x7 268 PGAR_2_HPRCOM_VOL, 0, 0x7f, 1),
269 SOC_DOUBLE_R("HPCOM Line2 Bypass Playb 269 SOC_DOUBLE_R("HPCOM Line2 Bypass Playback Volume", LINE2L_2_HPLCOM_VOL,
270 LINE2R_2_HPRCOM_VOL, 0, 0 270 LINE2R_2_HPRCOM_VOL, 0, 0x7f, 1),
271 271
272 /* 272 /*
273 * Note: enable Automatic input Gain C 273 * Note: enable Automatic input Gain Controller with care. It can
274 * adjust PGA to max value when ADC is 274 * adjust PGA to max value when ADC is on and will never go back.
275 */ 275 */
276 SOC_DOUBLE_R("AGC Switch", LAGC_CTRL_A 276 SOC_DOUBLE_R("AGC Switch", LAGC_CTRL_A, RAGC_CTRL_A, 7, 0x01, 0),
277 277
278 /* Input */ 278 /* Input */
279 SOC_DOUBLE_R("PGA Capture Volume", LAD 279 SOC_DOUBLE_R("PGA Capture Volume", LADC_VOL, RADC_VOL, 0, 0x7f, 0),
280 SOC_DOUBLE_R("PGA Capture Switch", LAD 280 SOC_DOUBLE_R("PGA Capture Switch", LADC_VOL, RADC_VOL, 7, 0x01, 1),
281 }; 281 };
282 282
283 /* add non dapm controls */ 283 /* add non dapm controls */
284 static int aic3x_add_controls(struct snd_soc_c 284 static int aic3x_add_controls(struct snd_soc_codec *codec)
285 { 285 {
286 int err, i; 286 int err, i;
287 287
288 for (i = 0; i < ARRAY_SIZE(aic3x_snd_c 288 for (i = 0; i < ARRAY_SIZE(aic3x_snd_controls); i++) {
289 err = snd_ctl_add(codec->card, 289 err = snd_ctl_add(codec->card,
290 snd_soc_cnew 290 snd_soc_cnew(&aic3x_snd_controls[i],
291 291 codec, NULL));
292 if (err < 0) 292 if (err < 0)
293 return err; 293 return err;
294 } 294 }
295 295
296 return 0; 296 return 0;
297 } 297 }
298 298
299 /* Left DAC Mux */ 299 /* Left DAC Mux */
300 static const struct snd_kcontrol_new aic3x_lef 300 static const struct snd_kcontrol_new aic3x_left_dac_mux_controls =
301 SOC_DAPM_ENUM("Route", aic3x_enum[LDAC_ENUM]); 301 SOC_DAPM_ENUM("Route", aic3x_enum[LDAC_ENUM]);
302 302
303 /* Right DAC Mux */ 303 /* Right DAC Mux */
304 static const struct snd_kcontrol_new aic3x_rig 304 static const struct snd_kcontrol_new aic3x_right_dac_mux_controls =
305 SOC_DAPM_ENUM("Route", aic3x_enum[RDAC_ENUM]); 305 SOC_DAPM_ENUM("Route", aic3x_enum[RDAC_ENUM]);
306 306
307 /* Left HPCOM Mux */ 307 /* Left HPCOM Mux */
308 static const struct snd_kcontrol_new aic3x_lef 308 static const struct snd_kcontrol_new aic3x_left_hpcom_mux_controls =
309 SOC_DAPM_ENUM("Route", aic3x_enum[LHPCOM_ENUM] 309 SOC_DAPM_ENUM("Route", aic3x_enum[LHPCOM_ENUM]);
310 310
311 /* Right HPCOM Mux */ 311 /* Right HPCOM Mux */
312 static const struct snd_kcontrol_new aic3x_rig 312 static const struct snd_kcontrol_new aic3x_right_hpcom_mux_controls =
313 SOC_DAPM_ENUM("Route", aic3x_enum[RHPCOM_ENUM] 313 SOC_DAPM_ENUM("Route", aic3x_enum[RHPCOM_ENUM]);
314 314
315 /* Left DAC_L1 Mixer */ 315 /* Left DAC_L1 Mixer */
316 static const struct snd_kcontrol_new aic3x_lef 316 static const struct snd_kcontrol_new aic3x_left_dac_mixer_controls[] = {
317 SOC_DAPM_SINGLE("Line Switch", DACL1_2 317 SOC_DAPM_SINGLE("Line Switch", DACL1_2_LLOPM_VOL, 7, 1, 0),
318 SOC_DAPM_SINGLE("Mono Switch", DACL1_2 318 SOC_DAPM_SINGLE("Mono Switch", DACL1_2_MONOLOPM_VOL, 7, 1, 0),
319 SOC_DAPM_SINGLE("HP Switch", DACL1_2_H 319 SOC_DAPM_SINGLE("HP Switch", DACL1_2_HPLOUT_VOL, 7, 1, 0),
320 SOC_DAPM_SINGLE("HPCOM Switch", DACL1_ 320 SOC_DAPM_SINGLE("HPCOM Switch", DACL1_2_HPLCOM_VOL, 7, 1, 0),
321 }; 321 };
322 322
323 /* Right DAC_R1 Mixer */ 323 /* Right DAC_R1 Mixer */
324 static const struct snd_kcontrol_new aic3x_rig 324 static const struct snd_kcontrol_new aic3x_right_dac_mixer_controls[] = {
325 SOC_DAPM_SINGLE("Line Switch", DACR1_2 325 SOC_DAPM_SINGLE("Line Switch", DACR1_2_RLOPM_VOL, 7, 1, 0),
326 SOC_DAPM_SINGLE("Mono Switch", DACR1_2 326 SOC_DAPM_SINGLE("Mono Switch", DACR1_2_MONOLOPM_VOL, 7, 1, 0),
327 SOC_DAPM_SINGLE("HP Switch", DACR1_2_H 327 SOC_DAPM_SINGLE("HP Switch", DACR1_2_HPROUT_VOL, 7, 1, 0),
328 SOC_DAPM_SINGLE("HPCOM Switch", DACR1_ 328 SOC_DAPM_SINGLE("HPCOM Switch", DACR1_2_HPRCOM_VOL, 7, 1, 0),
329 }; 329 };
330 330
331 /* Left PGA Mixer */ 331 /* Left PGA Mixer */
332 static const struct snd_kcontrol_new aic3x_lef 332 static const struct snd_kcontrol_new aic3x_left_pga_mixer_controls[] = {
333 SOC_DAPM_SINGLE_AIC3X("Line1L Switch", 333 SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_LADC_CTRL, 3, 1, 1),
334 SOC_DAPM_SINGLE_AIC3X("Line2L Switch", 334 SOC_DAPM_SINGLE_AIC3X("Line2L Switch", LINE2L_2_LADC_CTRL, 3, 1, 1),
335 SOC_DAPM_SINGLE_AIC3X("Mic3L Switch", 335 SOC_DAPM_SINGLE_AIC3X("Mic3L Switch", MIC3LR_2_LADC_CTRL, 4, 1, 1),
336 }; 336 };
337 337
338 /* Right PGA Mixer */ 338 /* Right PGA Mixer */
339 static const struct snd_kcontrol_new aic3x_rig 339 static const struct snd_kcontrol_new aic3x_right_pga_mixer_controls[] = {
340 SOC_DAPM_SINGLE_AIC3X("Line1R Switch", 340 SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_RADC_CTRL, 3, 1, 1),
341 SOC_DAPM_SINGLE_AIC3X("Line2R Switch", 341 SOC_DAPM_SINGLE_AIC3X("Line2R Switch", LINE2R_2_RADC_CTRL, 3, 1, 1),
342 SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", 342 SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", MIC3LR_2_RADC_CTRL, 0, 1, 1),
343 }; 343 };
344 344
345 /* Left Line1 Mux */ 345 /* Left Line1 Mux */
346 static const struct snd_kcontrol_new aic3x_lef 346 static const struct snd_kcontrol_new aic3x_left_line1_mux_controls =
347 SOC_DAPM_ENUM("Route", aic3x_enum[LINE1L_ENUM] 347 SOC_DAPM_ENUM("Route", aic3x_enum[LINE1L_ENUM]);
348 348
349 /* Right Line1 Mux */ 349 /* Right Line1 Mux */
350 static const struct snd_kcontrol_new aic3x_rig 350 static const struct snd_kcontrol_new aic3x_right_line1_mux_controls =
351 SOC_DAPM_ENUM("Route", aic3x_enum[LINE1R_ENUM] 351 SOC_DAPM_ENUM("Route", aic3x_enum[LINE1R_ENUM]);
352 352
353 /* Left Line2 Mux */ 353 /* Left Line2 Mux */
354 static const struct snd_kcontrol_new aic3x_lef 354 static const struct snd_kcontrol_new aic3x_left_line2_mux_controls =
355 SOC_DAPM_ENUM("Route", aic3x_enum[LINE2L_ENUM] 355 SOC_DAPM_ENUM("Route", aic3x_enum[LINE2L_ENUM]);
356 356
357 /* Right Line2 Mux */ 357 /* Right Line2 Mux */
358 static const struct snd_kcontrol_new aic3x_rig 358 static const struct snd_kcontrol_new aic3x_right_line2_mux_controls =
359 SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM] 359 SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM]);
360 360
361 /* Left PGA Bypass Mixer */ 361 /* Left PGA Bypass Mixer */
362 static const struct snd_kcontrol_new aic3x_lef 362 static const struct snd_kcontrol_new aic3x_left_pga_bp_mixer_controls[] = {
363 SOC_DAPM_SINGLE("Line Switch", PGAL_2_ 363 SOC_DAPM_SINGLE("Line Switch", PGAL_2_LLOPM_VOL, 7, 1, 0),
364 SOC_DAPM_SINGLE("Mono Switch", PGAL_2_ 364 SOC_DAPM_SINGLE("Mono Switch", PGAL_2_MONOLOPM_VOL, 7, 1, 0),
365 SOC_DAPM_SINGLE("HP Switch", PGAL_2_HP 365 SOC_DAPM_SINGLE("HP Switch", PGAL_2_HPLOUT_VOL, 7, 1, 0),
366 SOC_DAPM_SINGLE("HPCOM Switch", PGAL_2 366 SOC_DAPM_SINGLE("HPCOM Switch", PGAL_2_HPLCOM_VOL, 7, 1, 0),
367 }; 367 };
368 368
369 /* Right PGA Bypass Mixer */ 369 /* Right PGA Bypass Mixer */
370 static const struct snd_kcontrol_new aic3x_rig 370 static const struct snd_kcontrol_new aic3x_right_pga_bp_mixer_controls[] = {
371 SOC_DAPM_SINGLE("Line Switch", PGAR_2_ 371 SOC_DAPM_SINGLE("Line Switch", PGAR_2_RLOPM_VOL, 7, 1, 0),
372 SOC_DAPM_SINGLE("Mono Switch", PGAR_2_ 372 SOC_DAPM_SINGLE("Mono Switch", PGAR_2_MONOLOPM_VOL, 7, 1, 0),
373 SOC_DAPM_SINGLE("HP Switch", PGAR_2_HP 373 SOC_DAPM_SINGLE("HP Switch", PGAR_2_HPROUT_VOL, 7, 1, 0),
374 SOC_DAPM_SINGLE("HPCOM Switch", PGAR_2 374 SOC_DAPM_SINGLE("HPCOM Switch", PGAR_2_HPRCOM_VOL, 7, 1, 0),
375 }; 375 };
376 376
377 /* Left Line2 Bypass Mixer */ 377 /* Left Line2 Bypass Mixer */
378 static const struct snd_kcontrol_new aic3x_lef 378 static const struct snd_kcontrol_new aic3x_left_line2_bp_mixer_controls[] = {
379 SOC_DAPM_SINGLE("Line Switch", LINE2L_ 379 SOC_DAPM_SINGLE("Line Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0),
380 SOC_DAPM_SINGLE("Mono Switch", LINE2L_ 380 SOC_DAPM_SINGLE("Mono Switch", LINE2L_2_MONOLOPM_VOL, 7, 1, 0),
381 SOC_DAPM_SINGLE("HP Switch", LINE2L_2_ 381 SOC_DAPM_SINGLE("HP Switch", LINE2L_2_HPLOUT_VOL, 7, 1, 0),
382 SOC_DAPM_SINGLE("HPCOM Switch", LINE2L 382 SOC_DAPM_SINGLE("HPCOM Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0),
383 }; 383 };
384 384
385 /* Right Line2 Bypass Mixer */ 385 /* Right Line2 Bypass Mixer */
386 static const struct snd_kcontrol_new aic3x_rig 386 static const struct snd_kcontrol_new aic3x_right_line2_bp_mixer_controls[] = {
387 SOC_DAPM_SINGLE("Line Switch", LINE2R_ 387 SOC_DAPM_SINGLE("Line Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0),
388 SOC_DAPM_SINGLE("Mono Switch", LINE2R_ 388 SOC_DAPM_SINGLE("Mono Switch", LINE2R_2_MONOLOPM_VOL, 7, 1, 0),
389 SOC_DAPM_SINGLE("HP Switch", LINE2R_2_ 389 SOC_DAPM_SINGLE("HP Switch", LINE2R_2_HPROUT_VOL, 7, 1, 0),
390 SOC_DAPM_SINGLE("HPCOM Switch", LINE2R 390 SOC_DAPM_SINGLE("HPCOM Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0),
391 }; 391 };
392 392
393 static const struct snd_soc_dapm_widget aic3x_ 393 static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
394 /* Left DAC to Left Outputs */ 394 /* Left DAC to Left Outputs */
395 SND_SOC_DAPM_DAC("Left DAC", "Left Pla 395 SND_SOC_DAPM_DAC("Left DAC", "Left Playback", DAC_PWR, 7, 0),
396 SND_SOC_DAPM_MUX("Left DAC Mux", SND_S 396 SND_SOC_DAPM_MUX("Left DAC Mux", SND_SOC_NOPM, 0, 0,
397 &aic3x_left_dac_mux_c 397 &aic3x_left_dac_mux_controls),
398 SND_SOC_DAPM_MIXER("Left DAC_L1 Mixer" 398 SND_SOC_DAPM_MIXER("Left DAC_L1 Mixer", SND_SOC_NOPM, 0, 0,
399 &aic3x_left_dac_mix 399 &aic3x_left_dac_mixer_controls[0],
400 ARRAY_SIZE(aic3x_le 400 ARRAY_SIZE(aic3x_left_dac_mixer_controls)),
401 SND_SOC_DAPM_MUX("Left HPCOM Mux", SND 401 SND_SOC_DAPM_MUX("Left HPCOM Mux", SND_SOC_NOPM, 0, 0,
402 &aic3x_left_hpcom_mux 402 &aic3x_left_hpcom_mux_controls),
403 SND_SOC_DAPM_PGA("Left Line Out", LLOP 403 SND_SOC_DAPM_PGA("Left Line Out", LLOPM_CTRL, 0, 0, NULL, 0),
404 SND_SOC_DAPM_PGA("Left HP Out", HPLOUT 404 SND_SOC_DAPM_PGA("Left HP Out", HPLOUT_CTRL, 0, 0, NULL, 0),
405 SND_SOC_DAPM_PGA("Left HP Com", HPLCOM 405 SND_SOC_DAPM_PGA("Left HP Com", HPLCOM_CTRL, 0, 0, NULL, 0),
406 406
407 /* Right DAC to Right Outputs */ 407 /* Right DAC to Right Outputs */
408 SND_SOC_DAPM_DAC("Right DAC", "Right P 408 SND_SOC_DAPM_DAC("Right DAC", "Right Playback", DAC_PWR, 6, 0),
409 SND_SOC_DAPM_MUX("Right DAC Mux", SND_ 409 SND_SOC_DAPM_MUX("Right DAC Mux", SND_SOC_NOPM, 0, 0,
410 &aic3x_right_dac_mux_ 410 &aic3x_right_dac_mux_controls),
411 SND_SOC_DAPM_MIXER("Right DAC_R1 Mixer 411 SND_SOC_DAPM_MIXER("Right DAC_R1 Mixer", SND_SOC_NOPM, 0, 0,
412 &aic3x_right_dac_mi 412 &aic3x_right_dac_mixer_controls[0],
413 ARRAY_SIZE(aic3x_ri 413 ARRAY_SIZE(aic3x_right_dac_mixer_controls)),
414 SND_SOC_DAPM_MUX("Right HPCOM Mux", SN 414 SND_SOC_DAPM_MUX("Right HPCOM Mux", SND_SOC_NOPM, 0, 0,
415 &aic3x_right_hpcom_mu 415 &aic3x_right_hpcom_mux_controls),
416 SND_SOC_DAPM_PGA("Right Line Out", RLO 416 SND_SOC_DAPM_PGA("Right Line Out", RLOPM_CTRL, 0, 0, NULL, 0),
417 SND_SOC_DAPM_PGA("Right HP Out", HPROU 417 SND_SOC_DAPM_PGA("Right HP Out", HPROUT_CTRL, 0, 0, NULL, 0),
418 SND_SOC_DAPM_PGA("Right HP Com", HPRCO 418 SND_SOC_DAPM_PGA("Right HP Com", HPRCOM_CTRL, 0, 0, NULL, 0),
419 419
420 /* Mono Output */ 420 /* Mono Output */
421 SND_SOC_DAPM_PGA("Mono Out", MONOLOPM_ 421 SND_SOC_DAPM_PGA("Mono Out", MONOLOPM_CTRL, 0, 0, NULL, 0),
422 422
423 /* Left Inputs to Left ADC */ 423 /* Left Inputs to Left ADC */
424 SND_SOC_DAPM_ADC("Left ADC", "Left Cap 424 SND_SOC_DAPM_ADC("Left ADC", "Left Capture", LINE1L_2_LADC_CTRL, 2, 0),
425 SND_SOC_DAPM_MIXER("Left PGA Mixer", S 425 SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
426 &aic3x_left_pga_mix 426 &aic3x_left_pga_mixer_controls[0],
427 ARRAY_SIZE(aic3x_le 427 ARRAY_SIZE(aic3x_left_pga_mixer_controls)),
428 SND_SOC_DAPM_MUX("Left Line1L Mux", SN 428 SND_SOC_DAPM_MUX("Left Line1L Mux", SND_SOC_NOPM, 0, 0,
429 &aic3x_left_line1_mux 429 &aic3x_left_line1_mux_controls),
430 SND_SOC_DAPM_MUX("Left Line2L Mux", SN 430 SND_SOC_DAPM_MUX("Left Line2L Mux", SND_SOC_NOPM, 0, 0,
431 &aic3x_left_line2_mux 431 &aic3x_left_line2_mux_controls),
432 432
433 /* Right Inputs to Right ADC */ 433 /* Right Inputs to Right ADC */
434 SND_SOC_DAPM_ADC("Right ADC", "Right C 434 SND_SOC_DAPM_ADC("Right ADC", "Right Capture",
435 LINE1R_2_RADC_CTRL, 2 435 LINE1R_2_RADC_CTRL, 2, 0),
436 SND_SOC_DAPM_MIXER("Right PGA Mixer", 436 SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
437 &aic3x_right_pga_mi 437 &aic3x_right_pga_mixer_controls[0],
438 ARRAY_SIZE(aic3x_ri 438 ARRAY_SIZE(aic3x_right_pga_mixer_controls)),
439 SND_SOC_DAPM_MUX("Right Line1R Mux", S 439 SND_SOC_DAPM_MUX("Right Line1R Mux", SND_SOC_NOPM, 0, 0,
440 &aic3x_right_line1_mu 440 &aic3x_right_line1_mux_controls),
441 SND_SOC_DAPM_MUX("Right Line2R Mux", S 441 SND_SOC_DAPM_MUX("Right Line2R Mux", SND_SOC_NOPM, 0, 0,
442 &aic3x_right_line2_mu 442 &aic3x_right_line2_mux_controls),
443 443
444 /* Mic Bias */ 444 /* Mic Bias */
445 SND_SOC_DAPM_MICBIAS("Mic Bias 2V", MI 445 SND_SOC_DAPM_MICBIAS("Mic Bias 2V", MICBIAS_CTRL, 6, 0),
446 SND_SOC_DAPM_MICBIAS("Mic Bias 2.5V", 446 SND_SOC_DAPM_MICBIAS("Mic Bias 2.5V", MICBIAS_CTRL, 7, 0),
447 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", 447 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 6, 0),
448 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", 448 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 7, 0),
449 449
450 /* Left PGA to Left Output bypass */ 450 /* Left PGA to Left Output bypass */
451 SND_SOC_DAPM_MIXER("Left PGA Bypass Mi 451 SND_SOC_DAPM_MIXER("Left PGA Bypass Mixer", SND_SOC_NOPM, 0, 0,
452 &aic3x_left_pga_bp_ 452 &aic3x_left_pga_bp_mixer_controls[0],
453 ARRAY_SIZE(aic3x_le 453 ARRAY_SIZE(aic3x_left_pga_bp_mixer_controls)),
454 454
455 /* Right PGA to Right Output bypass */ 455 /* Right PGA to Right Output bypass */
456 SND_SOC_DAPM_MIXER("Right PGA Bypass M 456 SND_SOC_DAPM_MIXER("Right PGA Bypass Mixer", SND_SOC_NOPM, 0, 0,
457 &aic3x_right_pga_bp 457 &aic3x_right_pga_bp_mixer_controls[0],
458 ARRAY_SIZE(aic3x_ri 458 ARRAY_SIZE(aic3x_right_pga_bp_mixer_controls)),
459 459
460 /* Left Line2 to Left Output bypass */ 460 /* Left Line2 to Left Output bypass */
461 SND_SOC_DAPM_MIXER("Left Line2 Bypass 461 SND_SOC_DAPM_MIXER("Left Line2 Bypass Mixer", SND_SOC_NOPM, 0, 0,
462 &aic3x_left_line2_b 462 &aic3x_left_line2_bp_mixer_controls[0],
463 ARRAY_SIZE(aic3x_le 463 ARRAY_SIZE(aic3x_left_line2_bp_mixer_controls)),
464 464
465 /* Right Line2 to Right Output bypass 465 /* Right Line2 to Right Output bypass */
466 SND_SOC_DAPM_MIXER("Right Line2 Bypass 466 SND_SOC_DAPM_MIXER("Right Line2 Bypass Mixer", SND_SOC_NOPM, 0, 0,
467 &aic3x_right_line2_ 467 &aic3x_right_line2_bp_mixer_controls[0],
468 ARRAY_SIZE(aic3x_ri 468 ARRAY_SIZE(aic3x_right_line2_bp_mixer_controls)),
469 469
470 SND_SOC_DAPM_OUTPUT("LLOUT"), 470 SND_SOC_DAPM_OUTPUT("LLOUT"),
471 SND_SOC_DAPM_OUTPUT("RLOUT"), 471 SND_SOC_DAPM_OUTPUT("RLOUT"),
472 SND_SOC_DAPM_OUTPUT("MONO_LOUT"), 472 SND_SOC_DAPM_OUTPUT("MONO_LOUT"),
473 SND_SOC_DAPM_OUTPUT("HPLOUT"), 473 SND_SOC_DAPM_OUTPUT("HPLOUT"),
474 SND_SOC_DAPM_OUTPUT("HPROUT"), 474 SND_SOC_DAPM_OUTPUT("HPROUT"),
475 SND_SOC_DAPM_OUTPUT("HPLCOM"), 475 SND_SOC_DAPM_OUTPUT("HPLCOM"),
476 SND_SOC_DAPM_OUTPUT("HPRCOM"), 476 SND_SOC_DAPM_OUTPUT("HPRCOM"),
477 477
478 SND_SOC_DAPM_INPUT("MIC3L"), 478 SND_SOC_DAPM_INPUT("MIC3L"),
479 SND_SOC_DAPM_INPUT("MIC3R"), 479 SND_SOC_DAPM_INPUT("MIC3R"),
480 SND_SOC_DAPM_INPUT("LINE1L"), 480 SND_SOC_DAPM_INPUT("LINE1L"),
481 SND_SOC_DAPM_INPUT("LINE1R"), 481 SND_SOC_DAPM_INPUT("LINE1R"),
482 SND_SOC_DAPM_INPUT("LINE2L"), 482 SND_SOC_DAPM_INPUT("LINE2L"),
483 SND_SOC_DAPM_INPUT("LINE2R"), 483 SND_SOC_DAPM_INPUT("LINE2R"),
484 }; 484 };
485 485
486 static const char *intercon[][3] = { 486 static const char *intercon[][3] = {
487 /* Left Output */ 487 /* Left Output */
488 {"Left DAC Mux", "DAC_L1", "Left DAC"} 488 {"Left DAC Mux", "DAC_L1", "Left DAC"},
489 {"Left DAC Mux", "DAC_L2", "Left DAC"} 489 {"Left DAC Mux", "DAC_L2", "Left DAC"},
490 {"Left DAC Mux", "DAC_L3", "Left DAC"} 490 {"Left DAC Mux", "DAC_L3", "Left DAC"},
491 491
492 {"Left DAC_L1 Mixer", "Line Switch", " 492 {"Left DAC_L1 Mixer", "Line Switch", "Left DAC Mux"},
493 {"Left DAC_L1 Mixer", "Mono Switch", " 493 {"Left DAC_L1 Mixer", "Mono Switch", "Left DAC Mux"},
494 {"Left DAC_L1 Mixer", "HP Switch", "Le 494 {"Left DAC_L1 Mixer", "HP Switch", "Left DAC Mux"},
495 {"Left DAC_L1 Mixer", "HPCOM Switch", 495 {"Left DAC_L1 Mixer", "HPCOM Switch", "Left DAC Mux"},
496 {"Left Line Out", NULL, "Left DAC Mux" 496 {"Left Line Out", NULL, "Left DAC Mux"},
497 {"Left HP Out", NULL, "Left DAC Mux"}, 497 {"Left HP Out", NULL, "Left DAC Mux"},
498 498
499 {"Left HPCOM Mux", "differential of HP 499 {"Left HPCOM Mux", "differential of HPLOUT", "Left DAC_L1 Mixer"},
500 {"Left HPCOM Mux", "constant VCM", "Le 500 {"Left HPCOM Mux", "constant VCM", "Left DAC_L1 Mixer"},
501 {"Left HPCOM Mux", "single-ended", "Le 501 {"Left HPCOM Mux", "single-ended", "Left DAC_L1 Mixer"},
502 502
503 {"Left Line Out", NULL, "Left DAC_L1 M 503 {"Left Line Out", NULL, "Left DAC_L1 Mixer"},
504 {"Mono Out", NULL, "Left DAC_L1 Mixer" 504 {"Mono Out", NULL, "Left DAC_L1 Mixer"},
505 {"Left HP Out", NULL, "Left DAC_L1 Mix 505 {"Left HP Out", NULL, "Left DAC_L1 Mixer"},
506 {"Left HP Com", NULL, "Left HPCOM Mux" 506 {"Left HP Com", NULL, "Left HPCOM Mux"},
507 507
508 {"LLOUT", NULL, "Left Line Out"}, 508 {"LLOUT", NULL, "Left Line Out"},
509 {"LLOUT", NULL, "Left Line Out"}, 509 {"LLOUT", NULL, "Left Line Out"},
510 {"HPLOUT", NULL, "Left HP Out"}, 510 {"HPLOUT", NULL, "Left HP Out"},
511 {"HPLCOM", NULL, "Left HP Com"}, 511 {"HPLCOM", NULL, "Left HP Com"},
512 512
513 /* Right Output */ 513 /* Right Output */
514 {"Right DAC Mux", "DAC_R1", "Right DAC 514 {"Right DAC Mux", "DAC_R1", "Right DAC"},
515 {"Right DAC Mux", "DAC_R2", "Right DAC 515 {"Right DAC Mux", "DAC_R2", "Right DAC"},
516 {"Right DAC Mux", "DAC_R3", "Right DAC 516 {"Right DAC Mux", "DAC_R3", "Right DAC"},
517 517
518 {"Right DAC_R1 Mixer", "Line Switch", 518 {"Right DAC_R1 Mixer", "Line Switch", "Right DAC Mux"},
519 {"Right DAC_R1 Mixer", "Mono Switch", 519 {"Right DAC_R1 Mixer", "Mono Switch", "Right DAC Mux"},
520 {"Right DAC_R1 Mixer", "HP Switch", "R 520 {"Right DAC_R1 Mixer", "HP Switch", "Right DAC Mux"},
521 {"Right DAC_R1 Mixer", "HPCOM Switch", 521 {"Right DAC_R1 Mixer", "HPCOM Switch", "Right DAC Mux"},
522 {"Right Line Out", NULL, "Right DAC Mu 522 {"Right Line Out", NULL, "Right DAC Mux"},
523 {"Right HP Out", NULL, "Right DAC Mux" 523 {"Right HP Out", NULL, "Right DAC Mux"},
524 524
525 {"Right HPCOM Mux", "differential of H 525 {"Right HPCOM Mux", "differential of HPROUT", "Right DAC_R1 Mixer"},
526 {"Right HPCOM Mux", "constant VCM", "R 526 {"Right HPCOM Mux", "constant VCM", "Right DAC_R1 Mixer"},
527 {"Right HPCOM Mux", "single-ended", "R 527 {"Right HPCOM Mux", "single-ended", "Right DAC_R1 Mixer"},
528 {"Right HPCOM Mux", "differential of H 528 {"Right HPCOM Mux", "differential of HPLCOM", "Right DAC_R1 Mixer"},
529 {"Right HPCOM Mux", "external feedback 529 {"Right HPCOM Mux", "external feedback", "Right DAC_R1 Mixer"},
530 530
531 {"Right Line Out", NULL, "Right DAC_R1 531 {"Right Line Out", NULL, "Right DAC_R1 Mixer"},
532 {"Mono Out", NULL, "Right DAC_R1 Mixer 532 {"Mono Out", NULL, "Right DAC_R1 Mixer"},
533 {"Right HP Out", NULL, "Right DAC_R1 M 533 {"Right HP Out", NULL, "Right DAC_R1 Mixer"},
534 {"Right HP Com", NULL, "Right HPCOM Mu 534 {"Right HP Com", NULL, "Right HPCOM Mux"},
535 535
536 {"RLOUT", NULL, "Right Line Out"}, 536 {"RLOUT", NULL, "Right Line Out"},
537 {"RLOUT", NULL, "Right Line Out"}, 537 {"RLOUT", NULL, "Right Line Out"},
538 {"HPROUT", NULL, "Right HP Out"}, 538 {"HPROUT", NULL, "Right HP Out"},
539 {"HPRCOM", NULL, "Right HP Com"}, 539 {"HPRCOM", NULL, "Right HP Com"},
540 540
541 /* Mono Output */ 541 /* Mono Output */
542 {"MONOLOUT", NULL, "Mono Out"}, 542 {"MONOLOUT", NULL, "Mono Out"},
543 {"MONOLOUT", NULL, "Mono Out"}, 543 {"MONOLOUT", NULL, "Mono Out"},
544 544
545 /* Left Input */ 545 /* Left Input */
546 {"Left Line1L Mux", "single-ended", "L 546 {"Left Line1L Mux", "single-ended", "LINE1L"},
547 {"Left Line1L Mux", "differential", "L 547 {"Left Line1L Mux", "differential", "LINE1L"},
548 548
549 {"Left Line2L Mux", "single-ended", "L 549 {"Left Line2L Mux", "single-ended", "LINE2L"},
550 {"Left Line2L Mux", "differential", "L 550 {"Left Line2L Mux", "differential", "LINE2L"},
551 551
552 {"Left PGA Mixer", "Line1L Switch", "L 552 {"Left PGA Mixer", "Line1L Switch", "Left Line1L Mux"},
553 {"Left PGA Mixer", "Line2L Switch", "L 553 {"Left PGA Mixer", "Line2L Switch", "Left Line2L Mux"},
554 {"Left PGA Mixer", "Mic3L Switch", "MI 554 {"Left PGA Mixer", "Mic3L Switch", "MIC3L"},
555 555
556 {"Left ADC", NULL, "Left PGA Mixer"}, 556 {"Left ADC", NULL, "Left PGA Mixer"},
557 557
558 /* Right Input */ 558 /* Right Input */
559 {"Right Line1R Mux", "single-ended", " 559 {"Right Line1R Mux", "single-ended", "LINE1R"},
560 {"Right Line1R Mux", "differential", " 560 {"Right Line1R Mux", "differential", "LINE1R"},
561 561
562 {"Right Line2R Mux", "single-ended", " 562 {"Right Line2R Mux", "single-ended", "LINE2R"},
563 {"Right Line2R Mux", "differential", " 563 {"Right Line2R Mux", "differential", "LINE2R"},
564 564
565 {"Right PGA Mixer", "Line1R Switch", " 565 {"Right PGA Mixer", "Line1R Switch", "Right Line1R Mux"},
566 {"Right PGA Mixer", "Line2R Switch", " 566 {"Right PGA Mixer", "Line2R Switch", "Right Line2R Mux"},
567 {"Right PGA Mixer", "Mic3R Switch", "M 567 {"Right PGA Mixer", "Mic3R Switch", "MIC3R"},
568 568
569 {"Right ADC", NULL, "Right PGA Mixer"} 569 {"Right ADC", NULL, "Right PGA Mixer"},
570 570
571 /* Left PGA Bypass */ 571 /* Left PGA Bypass */
572 {"Left PGA Bypass Mixer", "Line Switch 572 {"Left PGA Bypass Mixer", "Line Switch", "Left PGA Mixer"},
573 {"Left PGA Bypass Mixer", "Mono Switch 573 {"Left PGA Bypass Mixer", "Mono Switch", "Left PGA Mixer"},
574 {"Left PGA Bypass Mixer", "HP Switch", 574 {"Left PGA Bypass Mixer", "HP Switch", "Left PGA Mixer"},
575 {"Left PGA Bypass Mixer", "HPCOM Switc 575 {"Left PGA Bypass Mixer", "HPCOM Switch", "Left PGA Mixer"},
576 576
577 {"Left HPCOM Mux", "differential of HP 577 {"Left HPCOM Mux", "differential of HPLOUT", "Left PGA Bypass Mixer"},
578 {"Left HPCOM Mux", "constant VCM", "Le 578 {"Left HPCOM Mux", "constant VCM", "Left PGA Bypass Mixer"},
579 {"Left HPCOM Mux", "single-ended", "Le 579 {"Left HPCOM Mux", "single-ended", "Left PGA Bypass Mixer"},
580 580
581 {"Left Line Out", NULL, "Left PGA Bypa 581 {"Left Line Out", NULL, "Left PGA Bypass Mixer"},
582 {"Mono Out", NULL, "Left PGA Bypass Mi 582 {"Mono Out", NULL, "Left PGA Bypass Mixer"},
583 {"Left HP Out", NULL, "Left PGA Bypass 583 {"Left HP Out", NULL, "Left PGA Bypass Mixer"},
584 584
585 /* Right PGA Bypass */ 585 /* Right PGA Bypass */
586 {"Right PGA Bypass Mixer", "Line Switc 586 {"Right PGA Bypass Mixer", "Line Switch", "Right PGA Mixer"},
587 {"Right PGA Bypass Mixer", "Mono Switc 587 {"Right PGA Bypass Mixer", "Mono Switch", "Right PGA Mixer"},
588 {"Right PGA Bypass Mixer", "HP Switch" 588 {"Right PGA Bypass Mixer", "HP Switch", "Right PGA Mixer"},
589 {"Right PGA Bypass Mixer", "HPCOM Swit 589 {"Right PGA Bypass Mixer", "HPCOM Switch", "Right PGA Mixer"},
590 590
591 {"Right HPCOM Mux", "differential of H 591 {"Right HPCOM Mux", "differential of HPROUT", "Right PGA Bypass Mixer"},
592 {"Right HPCOM Mux", "constant VCM", "R 592 {"Right HPCOM Mux", "constant VCM", "Right PGA Bypass Mixer"},
593 {"Right HPCOM Mux", "single-ended", "R 593 {"Right HPCOM Mux", "single-ended", "Right PGA Bypass Mixer"},
594 {"Right HPCOM Mux", "differential of H 594 {"Right HPCOM Mux", "differential of HPLCOM", "Right PGA Bypass Mixer"},
595 {"Right HPCOM Mux", "external feedback 595 {"Right HPCOM Mux", "external feedback", "Right PGA Bypass Mixer"},
596 596
597 {"Right Line Out", NULL, "Right PGA By 597 {"Right Line Out", NULL, "Right PGA Bypass Mixer"},
598 {"Mono Out", NULL, "Right PGA Bypass M 598 {"Mono Out", NULL, "Right PGA Bypass Mixer"},
599 {"Right HP Out", NULL, "Right PGA Bypa 599 {"Right HP Out", NULL, "Right PGA Bypass Mixer"},
600 600
601 /* Left Line2 Bypass */ 601 /* Left Line2 Bypass */
602 {"Left Line2 Bypass Mixer", "Line Swit 602 {"Left Line2 Bypass Mixer", "Line Switch", "Left Line2L Mux"},
603 {"Left Line2 Bypass Mixer", "Mono Swit 603 {"Left Line2 Bypass Mixer", "Mono Switch", "Left Line2L Mux"},
604 {"Left Line2 Bypass Mixer", "HP Switch 604 {"Left Line2 Bypass Mixer", "HP Switch", "Left Line2L Mux"},
605 {"Left Line2 Bypass Mixer", "HPCOM Swi 605 {"Left Line2 Bypass Mixer", "HPCOM Switch", "Left Line2L Mux"},
606 606
607 {"Left HPCOM Mux", "differential of HP 607 {"Left HPCOM Mux", "differential of HPLOUT", "Left Line2 Bypass Mixer"},
608 {"Left HPCOM Mux", "constant VCM", "Le 608 {"Left HPCOM Mux", "constant VCM", "Left Line2 Bypass Mixer"},
609 {"Left HPCOM Mux", "single-ended", "Le 609 {"Left HPCOM Mux", "single-ended", "Left Line2 Bypass Mixer"},
610 610
611 {"Left Line Out", NULL, "Left Line2 By 611 {"Left Line Out", NULL, "Left Line2 Bypass Mixer"},
612 {"Mono Out", NULL, "Left Line2 Bypass 612 {"Mono Out", NULL, "Left Line2 Bypass Mixer"},
613 {"Left HP Out", NULL, "Left Line2 Bypa 613 {"Left HP Out", NULL, "Left Line2 Bypass Mixer"},
614 614
615 /* Right Line2 Bypass */ 615 /* Right Line2 Bypass */
616 {"Right Line2 Bypass Mixer", "Line Swi 616 {"Right Line2 Bypass Mixer", "Line Switch", "Right Line2R Mux"},
617 {"Right Line2 Bypass Mixer", "Mono Swi 617 {"Right Line2 Bypass Mixer", "Mono Switch", "Right Line2R Mux"},
618 {"Right Line2 Bypass Mixer", "HP Switc 618 {"Right Line2 Bypass Mixer", "HP Switch", "Right Line2R Mux"},
619 {"Right Line2 Bypass Mixer", "HPCOM Sw 619 {"Right Line2 Bypass Mixer", "HPCOM Switch", "Right Line2R Mux"},
620 620
621 {"Right HPCOM Mux", "differential of H 621 {"Right HPCOM Mux", "differential of HPROUT", "Right Line2 Bypass Mixer"},
622 {"Right HPCOM Mux", "constant VCM", "R 622 {"Right HPCOM Mux", "constant VCM", "Right Line2 Bypass Mixer"},
623 {"Right HPCOM Mux", "single-ended", "R 623 {"Right HPCOM Mux", "single-ended", "Right Line2 Bypass Mixer"},
624 {"Right HPCOM Mux", "differential of H 624 {"Right HPCOM Mux", "differential of HPLCOM", "Right Line2 Bypass Mixer"},
625 {"Right HPCOM Mux", "external feedback 625 {"Right HPCOM Mux", "external feedback", "Right Line2 Bypass Mixer"},
626 626
627 {"Right Line Out", NULL, "Right Line2 627 {"Right Line Out", NULL, "Right Line2 Bypass Mixer"},
628 {"Mono Out", NULL, "Right Line2 Bypass 628 {"Mono Out", NULL, "Right Line2 Bypass Mixer"},
629 {"Right HP Out", NULL, "Right Line2 By 629 {"Right HP Out", NULL, "Right Line2 Bypass Mixer"},
630 630
631 /* terminator */ 631 /* terminator */
632 {NULL, NULL, NULL}, 632 {NULL, NULL, NULL},
633 }; 633 };
634 634
635 static int aic3x_add_widgets(struct snd_soc_co 635 static int aic3x_add_widgets(struct snd_soc_codec *codec)
636 { 636 {
637 int i; 637 int i;
638 638
639 for (i = 0; i < ARRAY_SIZE(aic3x_dapm_ 639 for (i = 0; i < ARRAY_SIZE(aic3x_dapm_widgets); i++)
640 snd_soc_dapm_new_control(codec 640 snd_soc_dapm_new_control(codec, &aic3x_dapm_widgets[i]);
641 641
642 /* set up audio path interconnects */ 642 /* set up audio path interconnects */
643 for (i = 0; intercon[i][0] != NULL; i+ 643 for (i = 0; intercon[i][0] != NULL; i++)
644 snd_soc_dapm_connect_input(cod 644 snd_soc_dapm_connect_input(codec, intercon[i][0],
645 int 645 intercon[i][1], intercon[i][2]);
646 646
647 snd_soc_dapm_new_widgets(codec); 647 snd_soc_dapm_new_widgets(codec);
648 return 0; 648 return 0;
649 } 649 }
650 650
651 struct aic3x_rate_divs { 651 struct aic3x_rate_divs {
652 u32 mclk; 652 u32 mclk;
653 u32 rate; 653 u32 rate;
654 u32 fsref_reg; 654 u32 fsref_reg;
655 u8 sr_reg:4; 655 u8 sr_reg:4;
656 u8 pllj_reg; 656 u8 pllj_reg;
657 u16 plld_reg; 657 u16 plld_reg;
658 }; 658 };
659 659
660 /* AIC3X codec mclk clock divider coefficients 660 /* AIC3X codec mclk clock divider coefficients */
661 static const struct aic3x_rate_divs aic3x_divs 661 static const struct aic3x_rate_divs aic3x_divs[] = {
662 /* 8k */ 662 /* 8k */
663 {22579200, 8000, 48000, 0xa, 8, 7075}, 663 {22579200, 8000, 48000, 0xa, 8, 7075},
664 {33868800, 8000, 48000, 0xa, 5, 8049}, 664 {33868800, 8000, 48000, 0xa, 5, 8049},
665 /* 11.025k */ 665 /* 11.025k */
666 {22579200, 11025, 44100, 0x6, 8, 0}, 666 {22579200, 11025, 44100, 0x6, 8, 0},
667 {33868800, 11025, 44100, 0x6, 5, 3333} 667 {33868800, 11025, 44100, 0x6, 5, 3333},
668 /* 16k */ 668 /* 16k */
669 {22579200, 16000, 48000, 0x4, 8, 7075} 669 {22579200, 16000, 48000, 0x4, 8, 7075},
670 {33868800, 16000, 48000, 0x4, 5, 8049} 670 {33868800, 16000, 48000, 0x4, 5, 8049},
671 /* 22.05k */ 671 /* 22.05k */
672 {22579200, 22050, 44100, 0x2, 8, 0}, 672 {22579200, 22050, 44100, 0x2, 8, 0},
673 {33868800, 22050, 44100, 0x2, 5, 3333} 673 {33868800, 22050, 44100, 0x2, 5, 3333},
674 /* 32k */ 674 /* 32k */
675 {22579200, 32000, 48000, 0x1, 8, 7075} 675 {22579200, 32000, 48000, 0x1, 8, 7075},
676 {33868800, 32000, 48000, 0x1, 5, 8049} 676 {33868800, 32000, 48000, 0x1, 5, 8049},
677 /* 44.1k */ 677 /* 44.1k */
678 {22579200, 44100, 44100, 0x0, 8, 0}, 678 {22579200, 44100, 44100, 0x0, 8, 0},
679 {33868800, 44100, 44100, 0x0, 5, 3333} 679 {33868800, 44100, 44100, 0x0, 5, 3333},
680 /* 48k */ 680 /* 48k */
681 {22579200, 48000, 48000, 0x0, 8, 7075} 681 {22579200, 48000, 48000, 0x0, 8, 7075},
682 {33868800, 48000, 48000, 0x0, 5, 8049} 682 {33868800, 48000, 48000, 0x0, 5, 8049},
683 /* 64k */ 683 /* 64k */
684 {22579200, 64000, 96000, 0x1, 8, 7075} 684 {22579200, 64000, 96000, 0x1, 8, 7075},
685 {33868800, 64000, 96000, 0x1, 5, 8049} 685 {33868800, 64000, 96000, 0x1, 5, 8049},
686 /* 88.2k */ 686 /* 88.2k */
687 {22579200, 88200, 88200, 0x0, 8, 0}, 687 {22579200, 88200, 88200, 0x0, 8, 0},
688 {33868800, 88200, 88200, 0x0, 5, 3333} 688 {33868800, 88200, 88200, 0x0, 5, 3333},
689 /* 96k */ 689 /* 96k */
690 {22579200, 96000, 96000, 0x0, 8, 7075} 690 {22579200, 96000, 96000, 0x0, 8, 7075},
691 {33868800, 96000, 96000, 0x0, 5, 8049} 691 {33868800, 96000, 96000, 0x0, 5, 8049},
692 }; 692 };
693 693
694 static inline int aic3x_get_divs(int mclk, int 694 static inline int aic3x_get_divs(int mclk, int rate)
695 { 695 {
696 int i; 696 int i;
697 697
698 for (i = 0; i < ARRAY_SIZE(aic3x_divs) 698 for (i = 0; i < ARRAY_SIZE(aic3x_divs); i++) {
699 if (aic3x_divs[i].rate == rate 699 if (aic3x_divs[i].rate == rate && aic3x_divs[i].mclk == mclk)
700 return i; 700 return i;
701 } 701 }
702 702
703 return 0; 703 return 0;
704 } 704 }
705 705
706 static int aic3x_hw_params(struct snd_pcm_subs 706 static int aic3x_hw_params(struct snd_pcm_substream *substream,
707 struct snd_pcm_hw_p 707 struct snd_pcm_hw_params *params)
708 { 708 {
709 struct snd_soc_pcm_runtime *rtd = subs 709 struct snd_soc_pcm_runtime *rtd = substream->private_data;
710 struct snd_soc_device *socdev = rtd->s 710 struct snd_soc_device *socdev = rtd->socdev;
711 struct snd_soc_codec *codec = socdev-> 711 struct snd_soc_codec *codec = socdev->codec;
712 struct aic3x_priv *aic3x = codec->priv 712 struct aic3x_priv *aic3x = codec->private_data;
713 int i; 713 int i;
714 u8 data, pll_p, pll_r, pll_j; 714 u8 data, pll_p, pll_r, pll_j;
715 u16 pll_d; 715 u16 pll_d;
716 716
717 i = aic3x_get_divs(aic3x->sysclk, para 717 i = aic3x_get_divs(aic3x->sysclk, params_rate(params));
718 718
719 /* Route Left DAC to left channel inpu 719 /* Route Left DAC to left channel input and
720 * right DAC to right channel input */ 720 * right DAC to right channel input */
721 data = (LDAC2LCH | RDAC2RCH); 721 data = (LDAC2LCH | RDAC2RCH);
722 switch (aic3x_divs[i].fsref_reg) { 722 switch (aic3x_divs[i].fsref_reg) {
723 case 44100: 723 case 44100:
724 data |= FSREF_44100; 724 data |= FSREF_44100;
725 break; 725 break;
726 case 48000: 726 case 48000:
727 data |= FSREF_48000; 727 data |= FSREF_48000;
728 break; 728 break;
729 case 88200: 729 case 88200:
730 data |= FSREF_44100 | DUAL_RAT 730 data |= FSREF_44100 | DUAL_RATE_MODE;
731 break; 731 break;
732 case 96000: 732 case 96000:
733 data |= FSREF_48000 | DUAL_RAT 733 data |= FSREF_48000 | DUAL_RATE_MODE;
734 break; 734 break;
735 } 735 }
736 aic3x_write(codec, AIC3X_CODEC_DATAPAT 736 aic3x_write(codec, AIC3X_CODEC_DATAPATH_REG, data);
737 737
738 /* codec sample rate select */ 738 /* codec sample rate select */
739 data = aic3x_divs[i].sr_reg; 739 data = aic3x_divs[i].sr_reg;
740 data |= (data << 4); 740 data |= (data << 4);
741 aic3x_write(codec, AIC3X_SAMPLE_RATE_S 741 aic3x_write(codec, AIC3X_SAMPLE_RATE_SEL_REG, data);
742 742
743 /* Use PLL for generation Fsref by equ 743 /* Use PLL for generation Fsref by equation:
744 * Fsref = (MCLK * K * R)/(2048 * P); 744 * Fsref = (MCLK * K * R)/(2048 * P);
745 * Fix P = 2 and R = 1 and calculate K 745 * Fix P = 2 and R = 1 and calculate K, if
746 * K = J.D, i.e. J - an interger porti 746 * K = J.D, i.e. J - an interger portion of K and D is the fractional
747 * one with 4 digits of precision; 747 * one with 4 digits of precision;
748 * Example: 748 * Example:
749 * For MCLK = 22.5792 MHz and Fsref = 749 * For MCLK = 22.5792 MHz and Fsref = 48kHz:
750 * Select P = 2, R= 1, K = 8.7074, whi 750 * Select P = 2, R= 1, K = 8.7074, which results in J = 8, D = 7074
751 */ 751 */
752 pll_p = 2; 752 pll_p = 2;
753 pll_r = 1; 753 pll_r = 1;
754 pll_j = aic3x_divs[i].pllj_reg; 754 pll_j = aic3x_divs[i].pllj_reg;
755 pll_d = aic3x_divs[i].plld_reg; 755 pll_d = aic3x_divs[i].plld_reg;
756 756
757 data = aic3x_read_reg_cache(codec, AIC 757 data = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
758 aic3x_write(codec, AIC3X_PLL_PROGA_REG 758 aic3x_write(codec, AIC3X_PLL_PROGA_REG, data | (pll_p << PLLP_SHIFT));
759 aic3x_write(codec, AIC3X_OVRF_STATUS_A 759 aic3x_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, pll_r << PLLR_SHIFT);
760 aic3x_write(codec, AIC3X_PLL_PROGB_REG 760 aic3x_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT);
761 aic3x_write(codec, AIC3X_PLL_PROGC_REG 761 aic3x_write(codec, AIC3X_PLL_PROGC_REG, (pll_d >> 6) << PLLD_MSB_SHIFT);
762 aic3x_write(codec, AIC3X_PLL_PROGD_REG 762 aic3x_write(codec, AIC3X_PLL_PROGD_REG,
763 (pll_d & 0x3F) << PLLD_LSB 763 (pll_d & 0x3F) << PLLD_LSB_SHIFT);
764 764
765 /* select data word length */ 765 /* select data word length */
766 data = 766 data =
767 aic3x_read_reg_cache(codec, AIC3X_ 767 aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & (~(0x3 << 4));
768 switch (params_format(params)) { 768 switch (params_format(params)) {
769 case SNDRV_PCM_FORMAT_S16_LE: 769 case SNDRV_PCM_FORMAT_S16_LE:
770 break; 770 break;
771 case SNDRV_PCM_FORMAT_S20_3LE: 771 case SNDRV_PCM_FORMAT_S20_3LE:
772 data |= (0x01 << 4); 772 data |= (0x01 << 4);
773 break; 773 break;
774 case SNDRV_PCM_FORMAT_S24_LE: 774 case SNDRV_PCM_FORMAT_S24_LE:
775 data |= (0x02 << 4); 775 data |= (0x02 << 4);
776 break; 776 break;
777 case SNDRV_PCM_FORMAT_S32_LE: 777 case SNDRV_PCM_FORMAT_S32_LE:
778 data |= (0x03 << 4); 778 data |= (0x03 << 4);
779 break; 779 break;
780 } 780 }
781 aic3x_write(codec, AIC3X_ASD_INTF_CTRL 781 aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, data);
782 782
783 return 0; 783 return 0;
784 } 784 }
785 785
786 static int aic3x_mute(struct snd_soc_codec_dai 786 static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute)
787 { 787 {
788 struct snd_soc_codec *codec = dai->cod 788 struct snd_soc_codec *codec = dai->codec;
789 u8 ldac_reg = aic3x_read_reg_cache(cod 789 u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON;
790 u8 rdac_reg = aic3x_read_reg_cache(cod 790 u8 rdac_reg = aic3x_read_reg_cache(codec, RDAC_VOL) & ~MUTE_ON;
791 791
792 if (mute) { 792 if (mute) {
793 aic3x_write(codec, LDAC_VOL, l 793 aic3x_write(codec, LDAC_VOL, ldac_reg | MUTE_ON);
794 aic3x_write(codec, RDAC_VOL, r 794 aic3x_write(codec, RDAC_VOL, rdac_reg | MUTE_ON);
795 } else { 795 } else {
796 aic3x_write(codec, LDAC_VOL, l 796 aic3x_write(codec, LDAC_VOL, ldac_reg);
797 aic3x_write(codec, RDAC_VOL, r 797 aic3x_write(codec, RDAC_VOL, rdac_reg);
798 } 798 }
799 799
800 return 0; 800 return 0;
801 } 801 }
802 802
803 static int aic3x_set_dai_sysclk(struct snd_soc 803 static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
804 int clk_id, un 804 int clk_id, unsigned int freq, int dir)
805 { 805 {
806 struct snd_soc_codec *codec = codec_da 806 struct snd_soc_codec *codec = codec_dai->codec;
807 struct aic3x_priv *aic3x = codec->priv 807 struct aic3x_priv *aic3x = codec->private_data;
808 808
809 switch (freq) { 809 switch (freq) {
810 case 22579200: 810 case 22579200:
811 case 33868800: 811 case 33868800:
812 aic3x->sysclk = freq; 812 aic3x->sysclk = freq;
813 return 0; 813 return 0;
814 } 814 }
815 815
816 return -EINVAL; 816 return -EINVAL;
817 } 817 }
818 818
819 static int aic3x_set_dai_fmt(struct snd_soc_co 819 static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
820 unsigned int fmt) 820 unsigned int fmt)
821 { 821 {
822 struct snd_soc_codec *codec = codec_da 822 struct snd_soc_codec *codec = codec_dai->codec;
823 struct aic3x_priv *aic3x = codec->priv 823 struct aic3x_priv *aic3x = codec->private_data;
824 u8 iface_areg = 0; 824 u8 iface_areg = 0;
825 u8 iface_breg = 0; 825 u8 iface_breg = 0;
826 826
827 /* set master/slave audio interface */ 827 /* set master/slave audio interface */
828 switch (fmt & SND_SOC_DAIFMT_MASTER_MA 828 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
829 case SND_SOC_DAIFMT_CBM_CFM: 829 case SND_SOC_DAIFMT_CBM_CFM:
830 aic3x->master = 1; 830 aic3x->master = 1;
831 iface_areg |= BIT_CLK_MASTER | 831 iface_areg |= BIT_CLK_MASTER | WORD_CLK_MASTER;
832 break; 832 break;
833 case SND_SOC_DAIFMT_CBS_CFS: 833 case SND_SOC_DAIFMT_CBS_CFS:
834 aic3x->master = 0; 834 aic3x->master = 0;
835 break; 835 break;
836 default: 836 default:
837 return -EINVAL; 837 return -EINVAL;
838 } 838 }
839 839
840 /* interface format */ 840 /* interface format */
841 switch (fmt & SND_SOC_DAIFMT_FORMAT_MA 841 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
842 case SND_SOC_DAIFMT_I2S: 842 case SND_SOC_DAIFMT_I2S:
843 break; 843 break;
844 case SND_SOC_DAIFMT_DSP_A: 844 case SND_SOC_DAIFMT_DSP_A:
845 iface_breg |= (0x01 << 6); 845 iface_breg |= (0x01 << 6);
846 break; 846 break;
847 case SND_SOC_DAIFMT_RIGHT_J: 847 case SND_SOC_DAIFMT_RIGHT_J:
848 iface_breg |= (0x02 << 6); 848 iface_breg |= (0x02 << 6);
849 break; 849 break;
850 case SND_SOC_DAIFMT_LEFT_J: 850 case SND_SOC_DAIFMT_LEFT_J:
851 iface_breg |= (0x03 << 6); 851 iface_breg |= (0x03 << 6);
852 break; 852 break;
853 default: 853 default:
854 return -EINVAL; 854 return -EINVAL;
855 } 855 }
856 856
857 /* set iface */ 857 /* set iface */
858 aic3x_write(codec, AIC3X_ASD_INTF_CTRL 858 aic3x_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg);
859 aic3x_write(codec, AIC3X_ASD_INTF_CTRL 859 aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg);
860 860
861 return 0; 861 return 0;
862 } 862 }
863 863
864 static int aic3x_dapm_event(struct snd_soc_cod 864 static int aic3x_dapm_event(struct snd_soc_codec *codec, int event)
865 { 865 {
866 struct aic3x_priv *aic3x = codec->priv 866 struct aic3x_priv *aic3x = codec->private_data;
867 u8 reg; 867 u8 reg;
868 868
869 switch (event) { 869 switch (event) {
870 case SNDRV_CTL_POWER_D0: 870 case SNDRV_CTL_POWER_D0:
871 /* all power is driven by DAPM 871 /* all power is driven by DAPM system */
872 if (aic3x->master) { 872 if (aic3x->master) {
873 /* enable pll */ 873 /* enable pll */
874 reg = aic3x_read_reg_c 874 reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
875 aic3x_write(codec, AIC 875 aic3x_write(codec, AIC3X_PLL_PROGA_REG,
876 reg | PLL_ 876 reg | PLL_ENABLE);
877 } 877 }
878 break; 878 break;
879 case SNDRV_CTL_POWER_D1: 879 case SNDRV_CTL_POWER_D1:
880 case SNDRV_CTL_POWER_D2: 880 case SNDRV_CTL_POWER_D2:
881 break; 881 break;
882 case SNDRV_CTL_POWER_D3hot: 882 case SNDRV_CTL_POWER_D3hot:
883 /* 883 /*
884 * all power is driven by DAPM 884 * all power is driven by DAPM system,
885 * so output power is safe if 885 * so output power is safe if bypass was set
886 */ 886 */
887 if (aic3x->master) { 887 if (aic3x->master) {
888 /* disable pll */ 888 /* disable pll */
889 reg = aic3x_read_reg_c 889 reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
890 aic3x_write(codec, AIC 890 aic3x_write(codec, AIC3X_PLL_PROGA_REG,
891 reg & ~PLL 891 reg & ~PLL_ENABLE);
892 } 892 }
893 break; 893 break;
894 case SNDRV_CTL_POWER_D3cold: 894 case SNDRV_CTL_POWER_D3cold:
895 /* force all power off */ 895 /* force all power off */
896 reg = aic3x_read_reg_cache(cod 896 reg = aic3x_read_reg_cache(codec, LINE1L_2_LADC_CTRL);
897 aic3x_write(codec, LINE1L_2_LA 897 aic3x_write(codec, LINE1L_2_LADC_CTRL, reg & ~LADC_PWR_ON);
898 reg = aic3x_read_reg_cache(cod 898 reg = aic3x_read_reg_cache(codec, LINE1R_2_RADC_CTRL);
899 aic3x_write(codec, LINE1R_2_RA 899 aic3x_write(codec, LINE1R_2_RADC_CTRL, reg & ~RADC_PWR_ON);
900 900
901 reg = aic3x_read_reg_cache(cod 901 reg = aic3x_read_reg_cache(codec, DAC_PWR);
902 aic3x_write(codec, DAC_PWR, re 902 aic3x_write(codec, DAC_PWR, reg & ~(LDAC_PWR_ON | RDAC_PWR_ON));
903 903
904 reg = aic3x_read_reg_cache(cod 904 reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL);
905 aic3x_write(codec, HPLOUT_CTRL 905 aic3x_write(codec, HPLOUT_CTRL, reg & ~HPLOUT_PWR_ON);
906 reg = aic3x_read_reg_cache(cod 906 reg = aic3x_read_reg_cache(codec, HPROUT_CTRL);
907 aic3x_write(codec, HPROUT_CTRL 907 aic3x_write(codec, HPROUT_CTRL, reg & ~HPROUT_PWR_ON);
908 908
909 reg = aic3x_read_reg_cache(cod 909 reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL);
910 aic3x_write(codec, HPLCOM_CTRL 910 aic3x_write(codec, HPLCOM_CTRL, reg & ~HPLCOM_PWR_ON);
911 reg = aic3x_read_reg_cache(cod 911 reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL);
912 aic3x_write(codec, HPRCOM_CTRL 912 aic3x_write(codec, HPRCOM_CTRL, reg & ~HPRCOM_PWR_ON);
913 913
914 reg = aic3x_read_reg_cache(cod 914 reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL);
915 aic3x_write(codec, MONOLOPM_CT 915 aic3x_write(codec, MONOLOPM_CTRL, reg & ~MONOLOPM_PWR_ON);
916 916
917 reg = aic3x_read_reg_cache(cod 917 reg = aic3x_read_reg_cache(codec, LLOPM_CTRL);
918 aic3x_write(codec, LLOPM_CTRL, 918 aic3x_write(codec, LLOPM_CTRL, reg & ~LLOPM_PWR_ON);
919 reg = aic3x_read_reg_cache(cod 919 reg = aic3x_read_reg_cache(codec, RLOPM_CTRL);
920 aic3x_write(codec, RLOPM_CTRL, 920 aic3x_write(codec, RLOPM_CTRL, reg & ~RLOPM_PWR_ON);
921 921
922 if (aic3x->master) { 922 if (aic3x->master) {
923 /* disable pll */ 923 /* disable pll */
924 reg = aic3x_read_reg_c 924 reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
925 aic3x_write(codec, AIC 925 aic3x_write(codec, AIC3X_PLL_PROGA_REG,
926 reg & ~PLL 926 reg & ~PLL_ENABLE);
927 } 927 }
928 break; 928 break;
929 } 929 }
930 codec->dapm_state = event; 930 codec->dapm_state = event;
931 931
932 return 0; 932 return 0;
933 } 933 }
934 934
935 #define AIC3X_RATES SNDRV_PCM_RATE_8000_96 935 #define AIC3X_RATES SNDRV_PCM_RATE_8000_96000
936 #define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_ 936 #define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
937 SNDRV_PCM_FMTBIT_S24_ 937 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
938 938
939 struct snd_soc_codec_dai aic3x_dai = { 939 struct snd_soc_codec_dai aic3x_dai = {
940 .name = "aic3x", 940 .name = "aic3x",
941 .playback = { 941 .playback = {
942 .stream_name = "Playback", 942 .stream_name = "Playback",
943 .channels_min = 1, 943 .channels_min = 1,
944 .channels_max = 2, 944 .channels_max = 2,
945 .rates = AIC3X_RATES, 945 .rates = AIC3X_RATES,
946 .formats = AIC3X_FORMATS,}, 946 .formats = AIC3X_FORMATS,},
947 .capture = { 947 .capture = {
948 .stream_name = "Capture", 948 .stream_name = "Capture",
949 .channels_min = 1, 949 .channels_min = 1,
950 .channels_max = 2, 950 .channels_max = 2,
951 .rates = AIC3X_RATES, 951 .rates = AIC3X_RATES,
952 .formats = AIC3X_FORMATS,}, 952 .formats = AIC3X_FORMATS,},
953 .ops = { 953 .ops = {
954 .hw_params = aic3x_hw_params, 954 .hw_params = aic3x_hw_params,
955 }, 955 },
956 .dai_ops = { 956 .dai_ops = {
957 .digital_mute = aic3x_mute, 957 .digital_mute = aic3x_mute,
958 .set_sysclk = aic3x_set_dai_sy 958 .set_sysclk = aic3x_set_dai_sysclk,
959 .set_fmt = aic3x_set_dai_fmt, 959 .set_fmt = aic3x_set_dai_fmt,
960 } 960 }
961 }; 961 };
962 EXPORT_SYMBOL_GPL(aic3x_dai); 962 EXPORT_SYMBOL_GPL(aic3x_dai);
963 963
964 static int aic3x_suspend(struct platform_devic 964 static int aic3x_suspend(struct platform_device *pdev, pm_message_t state)
965 { 965 {
966 struct snd_soc_device *socdev = platfo 966 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
967 struct snd_soc_codec *codec = socdev-> 967 struct snd_soc_codec *codec = socdev->codec;
968 968
969 aic3x_dapm_event(codec, SNDRV_CTL_POWE 969 aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3cold);
970 970
971 return 0; 971 return 0;
972 } 972 }
973 973
974 static int aic3x_resume(struct platform_device 974 static int aic3x_resume(struct platform_device *pdev)
975 { 975 {
976 struct snd_soc_device *socdev = platfo 976 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
977 struct snd_soc_codec *codec = socdev-> 977 struct snd_soc_codec *codec = socdev->codec;
978 int i; 978 int i;
979 u8 data[2]; 979 u8 data[2];
980 u8 *cache = codec->reg_cache; 980 u8 *cache = codec->reg_cache;
981 981
982 /* Sync reg_cache with the hardware */ 982 /* Sync reg_cache with the hardware */
983 for (i = 0; i < ARRAY_SIZE(aic3x_reg); 983 for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++) {
984 data[0] = i; 984 data[0] = i;
985 data[1] = cache[i]; 985 data[1] = cache[i];
986 codec->hw_write(codec->control 986 codec->hw_write(codec->control_data, data, 2);
987 } 987 }
988 988
989 aic3x_dapm_event(codec, codec->suspend 989 aic3x_dapm_event(codec, codec->suspend_dapm_state);
990 990
991 return 0; 991 return 0;
992 } 992 }
993 993
994 /* 994 /*
995 * initialise the AIC3X driver 995 * initialise the AIC3X driver
996 * register the mixer and dsp interfaces with 996 * register the mixer and dsp interfaces with the kernel
997 */ 997 */
998 static int aic3x_init(struct snd_soc_device *s 998 static int aic3x_init(struct snd_soc_device *socdev)
999 { 999 {
1000 struct snd_soc_codec *codec = socdev- 1000 struct snd_soc_codec *codec = socdev->codec;
1001 int reg, ret = 0; 1001 int reg, ret = 0;
1002 1002
1003 codec->name = "aic3x"; 1003 codec->name = "aic3x";
1004 codec->owner = THIS_MODULE; 1004 codec->owner = THIS_MODULE;
1005 codec->read = aic3x_read_reg_cache; 1005 codec->read = aic3x_read_reg_cache;
1006 codec->write = aic3x_write; 1006 codec->write = aic3x_write;
1007 codec->dapm_event = aic3x_dapm_event; 1007 codec->dapm_event = aic3x_dapm_event;
1008 codec->dai = &aic3x_dai; 1008 codec->dai = &aic3x_dai;
1009 codec->num_dai = 1; 1009 codec->num_dai = 1;
1010 codec->reg_cache_size = sizeof(aic3x_ 1010 codec->reg_cache_size = sizeof(aic3x_reg);
1011 codec->reg_cache = kmemdup(aic3x_reg, 1011 codec->reg_cache = kmemdup(aic3x_reg, sizeof(aic3x_reg), GFP_KERNEL);
1012 if (codec->reg_cache == NULL) 1012 if (codec->reg_cache == NULL)
1013 return -ENOMEM; 1013 return -ENOMEM;
1014 1014
1015 aic3x_write(codec, AIC3X_PAGE_SELECT, 1015 aic3x_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT);
1016 aic3x_write(codec, AIC3X_RESET, SOFT_ 1016 aic3x_write(codec, AIC3X_RESET, SOFT_RESET);
1017 1017
1018 /* register pcms */ 1018 /* register pcms */
1019 ret = snd_soc_new_pcms(socdev, SNDRV_ 1019 ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
1020 if (ret < 0) { 1020 if (ret < 0) {
1021 printk(KERN_ERR "aic3x: faile 1021 printk(KERN_ERR "aic3x: failed to create pcms\n");
1022 goto pcm_err; 1022 goto pcm_err;
1023 } 1023 }
1024 1024
1025 /* DAC default volume and mute */ 1025 /* DAC default volume and mute */
1026 aic3x_write(codec, LDAC_VOL, DEFAULT_ 1026 aic3x_write(codec, LDAC_VOL, DEFAULT_VOL | MUTE_ON);
1027 aic3x_write(codec, RDAC_VOL, DEFAULT_ 1027 aic3x_write(codec, RDAC_VOL, DEFAULT_VOL | MUTE_ON);
1028 1028
1029 /* DAC to HP default volume and route 1029 /* DAC to HP default volume and route to Output mixer */
1030 aic3x_write(codec, DACL1_2_HPLOUT_VOL 1030 aic3x_write(codec, DACL1_2_HPLOUT_VOL, DEFAULT_VOL | ROUTE_ON);
1031 aic3x_write(codec, DACR1_2_HPROUT_VOL 1031 aic3x_write(codec, DACR1_2_HPROUT_VOL, DEFAULT_VOL | ROUTE_ON);
1032 aic3x_write(codec, DACL1_2_HPLCOM_VOL 1032 aic3x_write(codec, DACL1_2_HPLCOM_VOL, DEFAULT_VOL | ROUTE_ON);
1033 aic3x_write(codec, DACR1_2_HPRCOM_VOL 1033 aic3x_write(codec, DACR1_2_HPRCOM_VOL, DEFAULT_VOL | ROUTE_ON);
1034 /* DAC to Line Out default volume and 1034 /* DAC to Line Out default volume and route to Output mixer */
1035 aic3x_write(codec, DACL1_2_LLOPM_VOL, 1035 aic3x_write(codec, DACL1_2_LLOPM_VOL, DEFAULT_VOL | ROUTE_ON);
1036 aic3x_write(codec, DACR1_2_RLOPM_VOL, 1036 aic3x_write(codec, DACR1_2_RLOPM_VOL, DEFAULT_VOL | ROUTE_ON);
1037 /* DAC to Mono Line Out default volum 1037 /* DAC to Mono Line Out default volume and route to Output mixer */
1038 aic3x_write(codec, DACL1_2_MONOLOPM_V 1038 aic3x_write(codec, DACL1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON);
1039 aic3x_write(codec, DACR1_2_MONOLOPM_V 1039 aic3x_write(codec, DACR1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON);
1040 1040
1041 /* unmute all outputs */ 1041 /* unmute all outputs */
1042 reg = aic3x_read_reg_cache(codec, LLO 1042 reg = aic3x_read_reg_cache(codec, LLOPM_CTRL);
1043 aic3x_write(codec, LLOPM_CTRL, reg | 1043 aic3x_write(codec, LLOPM_CTRL, reg | UNMUTE);
1044 reg = aic3x_read_reg_cache(codec, RLO 1044 reg = aic3x_read_reg_cache(codec, RLOPM_CTRL);
1045 aic3x_write(codec, RLOPM_CTRL, reg | 1045 aic3x_write(codec, RLOPM_CTRL, reg | UNMUTE);
1046 reg = aic3x_read_reg_cache(codec, MON 1046 reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL);
1047 aic3x_write(codec, MONOLOPM_CTRL, reg 1047 aic3x_write(codec, MONOLOPM_CTRL, reg | UNMUTE);
1048 reg = aic3x_read_reg_cache(codec, HPL 1048 reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL);
1049 aic3x_write(codec, HPLOUT_CTRL, reg | 1049 aic3x_write(codec, HPLOUT_CTRL, reg | UNMUTE);
1050 reg = aic3x_read_reg_cache(codec, HPR 1050 reg = aic3x_read_reg_cache(codec, HPROUT_CTRL);
1051 aic3x_write(codec, HPROUT_CTRL, reg | 1051 aic3x_write(codec, HPROUT_CTRL, reg | UNMUTE);
1052 reg = aic3x_read_reg_cache(codec, HPL 1052 reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL);
1053 aic3x_write(codec, HPLCOM_CTRL, reg | 1053 aic3x_write(codec, HPLCOM_CTRL, reg | UNMUTE);
1054 reg = aic3x_read_reg_cache(codec, HPR 1054 reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL);
1055 aic3x_write(codec, HPRCOM_CTRL, reg | 1055 aic3x_write(codec, HPRCOM_CTRL, reg | UNMUTE);
1056 1056
1057 /* ADC default volume and unmute */ 1057 /* ADC default volume and unmute */
1058 aic3x_write(codec, LADC_VOL, DEFAULT_ 1058 aic3x_write(codec, LADC_VOL, DEFAULT_GAIN);
1059 aic3x_write(codec, RADC_VOL, DEFAULT_ 1059 aic3x_write(codec, RADC_VOL, DEFAULT_GAIN);
1060 /* By default route Line1 to ADC PGA 1060 /* By default route Line1 to ADC PGA mixer */
1061 aic3x_write(codec, LINE1L_2_LADC_CTRL 1061 aic3x_write(codec, LINE1L_2_LADC_CTRL, 0x0);
1062 aic3x_write(codec, LINE1R_2_RADC_CTRL 1062 aic3x_write(codec, LINE1R_2_RADC_CTRL, 0x0);
1063 1063
1064 /* PGA to HP Bypass default volume, d 1064 /* PGA to HP Bypass default volume, disconnect from Output Mixer */
1065 aic3x_write(codec, PGAL_2_HPLOUT_VOL, 1065 aic3x_write(codec, PGAL_2_HPLOUT_VOL, DEFAULT_VOL);
1066 aic3x_write(codec, PGAR_2_HPROUT_VOL, 1066 aic3x_write(codec, PGAR_2_HPROUT_VOL, DEFAULT_VOL);
1067 aic3x_write(codec, PGAL_2_HPLCOM_VOL, 1067 aic3x_write(codec, PGAL_2_HPLCOM_VOL, DEFAULT_VOL);
1068 aic3x_write(codec, PGAR_2_HPRCOM_VOL, 1068 aic3x_write(codec, PGAR_2_HPRCOM_VOL, DEFAULT_VOL);
1069 /* PGA to Line Out default volume, di 1069 /* PGA to Line Out default volume, disconnect from Output Mixer */
1070 aic3x_write(codec, PGAL_2_LLOPM_VOL, 1070 aic3x_write(codec, PGAL_2_LLOPM_VOL, DEFAULT_VOL);
1071 aic3x_write(codec, PGAR_2_RLOPM_VOL, 1071 aic3x_write(codec, PGAR_2_RLOPM_VOL, DEFAULT_VOL);
1072 /* PGA to Mono Line Out default volum 1072 /* PGA to Mono Line Out default volume, disconnect from Output Mixer */
1073 aic3x_write(codec, PGAL_2_MONOLOPM_VO 1073 aic3x_write(codec, PGAL_2_MONOLOPM_VOL, DEFAULT_VOL);
1074 aic3x_write(codec, PGAR_2_MONOLOPM_VO 1074 aic3x_write(codec, PGAR_2_MONOLOPM_VOL, DEFAULT_VOL);
1075 1075
1076 /* Line2 to HP Bypass default volume, 1076 /* Line2 to HP Bypass default volume, disconnect from Output Mixer */
1077 aic3x_write(codec, LINE2L_2_HPLOUT_VO 1077 aic3x_write(codec, LINE2L_2_HPLOUT_VOL, DEFAULT_VOL);
1078 aic3x_write(codec, LINE2R_2_HPROUT_VO 1078 aic3x_write(codec, LINE2R_2_HPROUT_VOL, DEFAULT_VOL);
1079 aic3x_write(codec, LINE2L_2_HPLCOM_VO 1079 aic3x_write(codec, LINE2L_2_HPLCOM_VOL, DEFAULT_VOL);
1080 aic3x_write(codec, LINE2R_2_HPRCOM_VO 1080 aic3x_write(codec, LINE2R_2_HPRCOM_VOL, DEFAULT_VOL);
1081 /* Line2 Line Out default volume, dis 1081 /* Line2 Line Out default volume, disconnect from Output Mixer */
1082 aic3x_write(codec, LINE2L_2_LLOPM_VOL 1082 aic3x_write(codec, LINE2L_2_LLOPM_VOL, DEFAULT_VOL);
1083 aic3x_write(codec, LINE2R_2_RLOPM_VOL 1083 aic3x_write(codec, LINE2R_2_RLOPM_VOL, DEFAULT_VOL);
1084 /* Line2 to Mono Out default volume, 1084 /* Line2 to Mono Out default volume, disconnect from Output Mixer */
1085 aic3x_write(codec, LINE2L_2_MONOLOPM_ 1085 aic3x_write(codec, LINE2L_2_MONOLOPM_VOL, DEFAULT_VOL);
1086 aic3x_write(codec, LINE2R_2_MONOLOPM_ 1086 aic3x_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL);
1087 1087
1088 /* off, with power on */ 1088 /* off, with power on */
1089 aic3x_dapm_event(codec, SNDRV_CTL_POW 1089 aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3hot);
1090 1090
1091 aic3x_add_controls(codec); 1091 aic3x_add_controls(codec);
1092 aic3x_add_widgets(codec); 1092 aic3x_add_widgets(codec);
1093 ret = snd_soc_register_card(socdev); 1093 ret = snd_soc_register_card(socdev);
1094 if (ret < 0) { 1094 if (ret < 0) {
1095 printk(KERN_ERR "aic3x: faile 1095 printk(KERN_ERR "aic3x: failed to register card\n");
1096 goto card_err; 1096 goto card_err;
1097 } 1097 }
1098 1098
1099 return ret; 1099 return ret;
1100 1100
1101 card_err: 1101 card_err:
1102 snd_soc_free_pcms(socdev); 1102 snd_soc_free_pcms(socdev);
1103 snd_soc_dapm_free(socdev); 1103 snd_soc_dapm_free(socdev);
1104 pcm_err: 1104 pcm_err:
1105 kfree(codec->reg_cache); 1105 kfree(codec->reg_cache);
1106 return ret; 1106 return ret;
1107 } 1107 }
1108 1108
1109 static struct snd_soc_device *aic3x_socdev; 1109 static struct snd_soc_device *aic3x_socdev;
1110 1110
1111 #if defined(CONFIG_I2C) || defined(CONFIG_I2C 1111 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1112 /* 1112 /*
1113 * AIC3X 2 wire address can be up to 4 device 1113 * AIC3X 2 wire address can be up to 4 devices with device addresses
1114 * 0x18, 0x19, 0x1A, 0x1B 1114 * 0x18, 0x19, 0x1A, 0x1B
1115 */ 1115 */
1116 static unsigned short normal_i2c[] = { 0, I2C 1116 static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END };
1117 1117
1118 /* Magic definition of all other variables an 1118 /* Magic definition of all other variables and things */
1119 I2C_CLIENT_INSMOD; 1119 I2C_CLIENT_INSMOD;
1120 1120
1121 static struct i2c_driver aic3x_i2c_driver; 1121 static struct i2c_driver aic3x_i2c_driver;
1122 static struct i2c_client client_template; 1122 static struct i2c_client client_template;
1123 1123
1124 /* 1124 /*
1125 * If the i2c layer weren't so broken, we cou 1125 * If the i2c layer weren't so broken, we could pass this kind of data
1126 * around 1126 * around
1127 */ 1127 */
1128 static int aic3x_codec_probe(struct i2c_adapt 1128 static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind)
1129 { 1129 {
1130 struct snd_soc_device *socdev = aic3x 1130 struct snd_soc_device *socdev = aic3x_socdev;
1131 struct aic3x_setup_data *setup = socd 1131 struct aic3x_setup_data *setup = socdev->codec_data;
1132 struct snd_soc_codec *codec = socdev- 1132 struct snd_soc_codec *codec = socdev->codec;
1133 struct i2c_client *i2c; 1133 struct i2c_client *i2c;
1134 int ret; 1134 int ret;
1135 1135
1136 if (addr != setup->i2c_address) 1136 if (addr != setup->i2c_address)
1137 return -ENODEV; 1137 return -ENODEV;
1138 1138
1139 client_template.adapter = adap; 1139 client_template.adapter = adap;
1140 client_template.addr = addr; 1140 client_template.addr = addr;
1141 1141
1142 i2c = kmemdup(&client_template, sizeo 1142 i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
1143 if (i2c == NULL) { 1143 if (i2c == NULL) {
1144 kfree(codec); 1144 kfree(codec);
1145 return -ENOMEM; 1145 return -ENOMEM;
1146 } 1146 }
1147 i2c_set_clientdata(i2c, codec); 1147 i2c_set_clientdata(i2c, codec);
1148 codec->control_data = i2c; 1148 codec->control_data = i2c;
1149 1149
1150 ret = i2c_attach_client(i2c); 1150 ret = i2c_attach_client(i2c);
1151 if (ret < 0) { 1151 if (ret < 0) {
1152 printk(KERN_ERR "aic3x: faile 1152 printk(KERN_ERR "aic3x: failed to attach codec at addr %x\n",
1153 addr); 1153 addr);
1154 goto err; 1154 goto err;
1155 } 1155 }
1156 1156
1157 ret = aic3x_init(socdev); 1157 ret = aic3x_init(socdev);
1158 if (ret < 0) { 1158 if (ret < 0) {
1159 printk(KERN_ERR "aic3x: faile 1159 printk(KERN_ERR "aic3x: failed to initialise AIC3X\n");
1160 goto err; 1160 goto err;
1161 } 1161 }
1162 return ret; 1162 return ret;
1163 1163
1164 err: 1164 err:
1165 kfree(codec); 1165 kfree(codec);
1166 kfree(i2c); 1166 kfree(i2c);
1167 return ret; 1167 return ret;
1168 } 1168 }
1169 1169
1170 static int aic3x_i2c_detach(struct i2c_client 1170 static int aic3x_i2c_detach(struct i2c_client *client)
1171 { 1171 {
1172 struct snd_soc_codec *codec = i2c_get 1172 struct snd_soc_codec *codec = i2c_get_clientdata(client);
1173 i2c_detach_client(client); 1173 i2c_detach_client(client);
1174 kfree(codec->reg_cache); 1174 kfree(codec->reg_cache);
1175 kfree(client); 1175 kfree(client);
1176 return 0; 1176 return 0;
1177 } 1177 }
1178 1178
1179 static int aic3x_i2c_attach(struct i2c_adapte 1179 static int aic3x_i2c_attach(struct i2c_adapter *adap)
1180 { 1180 {
1181 return i2c_probe(adap, &addr_data, ai 1181 return i2c_probe(adap, &addr_data, aic3x_codec_probe);
1182 } 1182 }
1183 1183
1184 /* machine i2c codec control layer */ 1184 /* machine i2c codec control layer */
1185 static struct i2c_driver aic3x_i2c_driver = { 1185 static struct i2c_driver aic3x_i2c_driver = {
1186 .driver = { 1186 .driver = {
1187 .name = "aic3x I2C Codec", 1187 .name = "aic3x I2C Codec",
1188 .owner = THIS_MODULE, 1188 .owner = THIS_MODULE,
1189 }, 1189 },
1190 .attach_adapter = aic3x_i2c_attach, 1190 .attach_adapter = aic3x_i2c_attach,
1191 .detach_client = aic3x_i2c_detach, 1191 .detach_client = aic3x_i2c_detach,
1192 }; 1192 };
1193 1193
1194 static struct i2c_client client_template = { 1194 static struct i2c_client client_template = {
1195 .name = "AIC3X", 1195 .name = "AIC3X",
1196 .driver = &aic3x_i2c_driver, 1196 .driver = &aic3x_i2c_driver,
1197 }; 1197 };
1198 #endif 1198 #endif
1199 1199
1200 static int aic3x_probe(struct platform_device 1200 static int aic3x_probe(struct platform_device *pdev)
1201 { 1201 {
1202 struct snd_soc_device *socdev = platf 1202 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
1203 struct aic3x_setup_data *setup; 1203 struct aic3x_setup_data *setup;
1204 struct snd_soc_codec *codec; 1204 struct snd_soc_codec *codec;
1205 struct aic3x_priv *aic3x; 1205 struct aic3x_priv *aic3x;
1206 int ret = 0; 1206 int ret = 0;
1207 1207
1208 printk(KERN_INFO "AIC3X Audio Codec % 1208 printk(KERN_INFO "AIC3X Audio Codec %s\n", AIC3X_VERSION);
1209 1209
1210 setup = socdev->codec_data; 1210 setup = socdev->codec_data;
1211 codec = kzalloc(sizeof(struct snd_soc 1211 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
1212 if (codec == NULL) 1212 if (codec == NULL)
1213 return -ENOMEM; 1213 return -ENOMEM;
1214 1214
1215 aic3x = kzalloc(sizeof(struct aic3x_p 1215 aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL);
1216 if (aic3x == NULL) { 1216 if (aic3x == NULL) {
1217 kfree(codec); 1217 kfree(codec);
1218 return -ENOMEM; 1218 return -ENOMEM;
1219 } 1219 }
1220 1220
1221 codec->private_data = aic3x; 1221 codec->private_data = aic3x;
1222 socdev->codec = codec; 1222 socdev->codec = codec;
1223 mutex_init(&codec->mutex); 1223 mutex_init(&codec->mutex);
1224 INIT_LIST_HEAD(&codec->dapm_widgets); 1224 INIT_LIST_HEAD(&codec->dapm_widgets);
1225 INIT_LIST_HEAD(&codec->dapm_paths); 1225 INIT_LIST_HEAD(&codec->dapm_paths);
1226 1226
1227 aic3x_socdev = socdev; 1227 aic3x_socdev = socdev;
1228 #if defined(CONFIG_I2C) || defined(CONFIG_I2C 1228 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1229 if (setup->i2c_address) { 1229 if (setup->i2c_address) {
1230 normal_i2c[0] = setup->i2c_ad 1230 normal_i2c[0] = setup->i2c_address;
1231 codec->hw_write = (hw_write_t 1231 codec->hw_write = (hw_write_t) i2c_master_send;
1232 ret = i2c_add_driver(&aic3x_i 1232 ret = i2c_add_driver(&aic3x_i2c_driver);
1233 if (ret != 0) 1233 if (ret != 0)
1234 printk(KERN_ERR "can' 1234 printk(KERN_ERR "can't add i2c driver");
1235 } 1235 }
1236 #else 1236 #else
1237 /* Add other interfaces here */ 1237 /* Add other interfaces here */
1238 #endif 1238 #endif
1239 return ret; 1239 return ret;
1240 } 1240 }
1241 1241
1242 static int aic3x_remove(struct platform_devic 1242 static int aic3x_remove(struct platform_device *pdev)
1243 { 1243 {
1244 struct snd_soc_device *socdev = platf 1244 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
1245 struct snd_soc_codec *codec = socdev- 1245 struct snd_soc_codec *codec = socdev->codec;
1246 1246
1247 /* power down chip */ 1247 /* power down chip */
1248 if (codec->control_data) 1248 if (codec->control_data)
1249 aic3x_dapm_event(codec, SNDRV 1249 aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3);
1250 1250
1251 snd_soc_free_pcms(socdev); 1251 snd_soc_free_pcms(socdev);
1252 snd_soc_dapm_free(socdev); 1252 snd_soc_dapm_free(socdev);
1253 #if defined(CONFIG_I2C) || defined(CONFIG_I2C 1253 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1254 i2c_del_driver(&aic3x_i2c_driver); 1254 i2c_del_driver(&aic3x_i2c_driver);
1255 #endif 1255 #endif
1256 kfree(codec->private_data); 1256 kfree(codec->private_data);
1257 kfree(codec); 1257 kfree(codec);
1258 1258
1259 return 0; 1259 return 0;
1260 } 1260 }
1261 1261
1262 struct snd_soc_codec_device soc_codec_dev_aic 1262 struct snd_soc_codec_device soc_codec_dev_aic3x = {
1263 .probe = aic3x_probe, 1263 .probe = aic3x_probe,
1264 .remove = aic3x_remove, 1264 .remove = aic3x_remove,
1265 .suspend = aic3x_suspend, 1265 .suspend = aic3x_suspend,
1266 .resume = aic3x_resume, 1266 .resume = aic3x_resume,
1267 }; 1267 };
1268 EXPORT_SYMBOL_GPL(soc_codec_dev_aic3x); 1268 EXPORT_SYMBOL_GPL(soc_codec_dev_aic3x);
1269 1269
1270 MODULE_DESCRIPTION("ASoC TLV320AIC3X codec dr 1270 MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver");
1271 MODULE_AUTHOR("Vladimir Barinov"); 1271 MODULE_AUTHOR("Vladimir Barinov");
1272 MODULE_LICENSE("GPL"); 1272 MODULE_LICENSE("GPL");
1273 1273
|
This page was automatically generated by the
LXR engine.
|