diff options
Diffstat (limited to 'sound/soc/codecs/da7210.c')
-rw-r--r-- | sound/soc/codecs/da7210.c | 649 |
1 files changed, 515 insertions, 134 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 92fd9d7a922..0ebcbd53449 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c | |||
@@ -26,23 +26,41 @@ | |||
26 | #include <sound/tlv.h> | 26 | #include <sound/tlv.h> |
27 | 27 | ||
28 | /* DA7210 register space */ | 28 | /* DA7210 register space */ |
29 | #define DA7210_CONTROL 0x01 | ||
29 | #define DA7210_STATUS 0x02 | 30 | #define DA7210_STATUS 0x02 |
30 | #define DA7210_STARTUP1 0x03 | 31 | #define DA7210_STARTUP1 0x03 |
32 | #define DA7210_STARTUP2 0x04 | ||
33 | #define DA7210_STARTUP3 0x05 | ||
31 | #define DA7210_MIC_L 0x07 | 34 | #define DA7210_MIC_L 0x07 |
32 | #define DA7210_MIC_R 0x08 | 35 | #define DA7210_MIC_R 0x08 |
36 | #define DA7210_AUX1_L 0x09 | ||
37 | #define DA7210_AUX1_R 0x0A | ||
38 | #define DA7210_AUX2 0x0B | ||
39 | #define DA7210_IN_GAIN 0x0C | ||
33 | #define DA7210_INMIX_L 0x0D | 40 | #define DA7210_INMIX_L 0x0D |
34 | #define DA7210_INMIX_R 0x0E | 41 | #define DA7210_INMIX_R 0x0E |
35 | #define DA7210_ADC_HPF 0x0F | 42 | #define DA7210_ADC_HPF 0x0F |
36 | #define DA7210_ADC 0x10 | 43 | #define DA7210_ADC 0x10 |
44 | #define DA7210_ADC_EQ1_2 0X11 | ||
45 | #define DA7210_ADC_EQ3_4 0x12 | ||
46 | #define DA7210_ADC_EQ5 0x13 | ||
37 | #define DA7210_DAC_HPF 0x14 | 47 | #define DA7210_DAC_HPF 0x14 |
38 | #define DA7210_DAC_L 0x15 | 48 | #define DA7210_DAC_L 0x15 |
39 | #define DA7210_DAC_R 0x16 | 49 | #define DA7210_DAC_R 0x16 |
40 | #define DA7210_DAC_SEL 0x17 | 50 | #define DA7210_DAC_SEL 0x17 |
51 | #define DA7210_SOFTMUTE 0x18 | ||
52 | #define DA7210_DAC_EQ1_2 0x19 | ||
53 | #define DA7210_DAC_EQ3_4 0x1A | ||
54 | #define DA7210_DAC_EQ5 0x1B | ||
41 | #define DA7210_OUTMIX_L 0x1C | 55 | #define DA7210_OUTMIX_L 0x1C |
42 | #define DA7210_OUTMIX_R 0x1D | 56 | #define DA7210_OUTMIX_R 0x1D |
57 | #define DA7210_OUT1_L 0x1E | ||
58 | #define DA7210_OUT1_R 0x1F | ||
59 | #define DA7210_OUT2 0x20 | ||
43 | #define DA7210_HP_L_VOL 0x21 | 60 | #define DA7210_HP_L_VOL 0x21 |
44 | #define DA7210_HP_R_VOL 0x22 | 61 | #define DA7210_HP_R_VOL 0x22 |
45 | #define DA7210_HP_CFG 0x23 | 62 | #define DA7210_HP_CFG 0x23 |
63 | #define DA7210_ZERO_CROSS 0x24 | ||
46 | #define DA7210_DAI_SRC_SEL 0x25 | 64 | #define DA7210_DAI_SRC_SEL 0x25 |
47 | #define DA7210_DAI_CFG1 0x26 | 65 | #define DA7210_DAI_CFG1 0x26 |
48 | #define DA7210_DAI_CFG3 0x28 | 66 | #define DA7210_DAI_CFG3 0x28 |
@@ -50,6 +68,12 @@ | |||
50 | #define DA7210_PLL_DIV2 0x2A | 68 | #define DA7210_PLL_DIV2 0x2A |
51 | #define DA7210_PLL_DIV3 0x2B | 69 | #define DA7210_PLL_DIV3 0x2B |
52 | #define DA7210_PLL 0x2C | 70 | #define DA7210_PLL 0x2C |
71 | #define DA7210_ALC_MAX 0x83 | ||
72 | #define DA7210_ALC_MIN 0x84 | ||
73 | #define DA7210_ALC_NOIS 0x85 | ||
74 | #define DA7210_ALC_ATT 0x86 | ||
75 | #define DA7210_ALC_REL 0x87 | ||
76 | #define DA7210_ALC_DEL 0x88 | ||
53 | #define DA7210_A_HID_UNLOCK 0x8A | 77 | #define DA7210_A_HID_UNLOCK 0x8A |
54 | #define DA7210_A_TEST_UNLOCK 0x8B | 78 | #define DA7210_A_TEST_UNLOCK 0x8B |
55 | #define DA7210_A_PLL1 0x90 | 79 | #define DA7210_A_PLL1 0x90 |
@@ -72,6 +96,7 @@ | |||
72 | #define DA7210_IN_R_EN (1 << 7) | 96 | #define DA7210_IN_R_EN (1 << 7) |
73 | 97 | ||
74 | /* ADC bit fields */ | 98 | /* ADC bit fields */ |
99 | #define DA7210_ADC_ALC_EN (1 << 0) | ||
75 | #define DA7210_ADC_L_EN (1 << 3) | 100 | #define DA7210_ADC_L_EN (1 << 3) |
76 | #define DA7210_ADC_R_EN (1 << 7) | 101 | #define DA7210_ADC_R_EN (1 << 7) |
77 | 102 | ||
@@ -105,12 +130,17 @@ | |||
105 | 130 | ||
106 | /* DAI_CFG1 bit fields */ | 131 | /* DAI_CFG1 bit fields */ |
107 | #define DA7210_DAI_WORD_S16_LE (0 << 0) | 132 | #define DA7210_DAI_WORD_S16_LE (0 << 0) |
133 | #define DA7210_DAI_WORD_S20_3LE (1 << 0) | ||
108 | #define DA7210_DAI_WORD_S24_LE (2 << 0) | 134 | #define DA7210_DAI_WORD_S24_LE (2 << 0) |
135 | #define DA7210_DAI_WORD_S32_LE (3 << 0) | ||
109 | #define DA7210_DAI_FLEN_64BIT (1 << 2) | 136 | #define DA7210_DAI_FLEN_64BIT (1 << 2) |
137 | #define DA7210_DAI_MODE_SLAVE (0 << 7) | ||
110 | #define DA7210_DAI_MODE_MASTER (1 << 7) | 138 | #define DA7210_DAI_MODE_MASTER (1 << 7) |
111 | 139 | ||
112 | /* DAI_CFG3 bit fields */ | 140 | /* DAI_CFG3 bit fields */ |
113 | #define DA7210_DAI_FORMAT_I2SMODE (0 << 0) | 141 | #define DA7210_DAI_FORMAT_I2SMODE (0 << 0) |
142 | #define DA7210_DAI_FORMAT_LEFT_J (1 << 0) | ||
143 | #define DA7210_DAI_FORMAT_RIGHT_J (2 << 0) | ||
114 | #define DA7210_DAI_OE (1 << 3) | 144 | #define DA7210_DAI_OE (1 << 3) |
115 | #define DA7210_DAI_EN (1 << 7) | 145 | #define DA7210_DAI_EN (1 << 7) |
116 | 146 | ||
@@ -133,6 +163,43 @@ | |||
133 | #define DA7210_PLL_FS_96000 (0xF << 0) | 163 | #define DA7210_PLL_FS_96000 (0xF << 0) |
134 | #define DA7210_PLL_EN (0x1 << 7) | 164 | #define DA7210_PLL_EN (0x1 << 7) |
135 | 165 | ||
166 | /* SOFTMUTE bit fields */ | ||
167 | #define DA7210_RAMP_EN (1 << 6) | ||
168 | |||
169 | /* CONTROL bit fields */ | ||
170 | #define DA7210_NOISE_SUP_EN (1 << 3) | ||
171 | |||
172 | /* IN_GAIN bit fields */ | ||
173 | #define DA7210_INPGA_L_VOL (0x0F << 0) | ||
174 | #define DA7210_INPGA_R_VOL (0xF0 << 0) | ||
175 | |||
176 | /* ZERO_CROSS bit fields */ | ||
177 | #define DA7210_AUX1_L_ZC (1 << 0) | ||
178 | #define DA7210_AUX1_R_ZC (1 << 1) | ||
179 | #define DA7210_HP_L_ZC (1 << 6) | ||
180 | #define DA7210_HP_R_ZC (1 << 7) | ||
181 | |||
182 | /* AUX1_L bit fields */ | ||
183 | #define DA7210_AUX1_L_VOL (0x3F << 0) | ||
184 | |||
185 | /* AUX1_R bit fields */ | ||
186 | #define DA7210_AUX1_R_VOL (0x3F << 0) | ||
187 | |||
188 | /* Minimum INPGA and AUX1 volume to enable noise suppression */ | ||
189 | #define DA7210_INPGA_MIN_VOL_NS 0x0A /* 10.5dB */ | ||
190 | #define DA7210_AUX1_MIN_VOL_NS 0x35 /* 6dB */ | ||
191 | |||
192 | /* OUT1_L bit fields */ | ||
193 | #define DA7210_OUT1_L_EN (1 << 7) | ||
194 | |||
195 | /* OUT1_R bit fields */ | ||
196 | #define DA7210_OUT1_R_EN (1 << 7) | ||
197 | |||
198 | /* OUT2 bit fields */ | ||
199 | #define DA7210_OUT2_OUTMIX_R (1 << 5) | ||
200 | #define DA7210_OUT2_OUTMIX_L (1 << 6) | ||
201 | #define DA7210_OUT2_EN (1 << 7) | ||
202 | |||
136 | #define DA7210_VERSION "0.0.1" | 203 | #define DA7210_VERSION "0.0.1" |
137 | 204 | ||
138 | /* | 205 | /* |
@@ -144,24 +211,351 @@ | |||
144 | * mute : 0x10 | 211 | * mute : 0x10 |
145 | * reserved : 0x00 - 0x0F | 212 | * reserved : 0x00 - 0x0F |
146 | * | 213 | * |
147 | * ** FIXME ** | ||
148 | * | ||
149 | * Reserved area are considered as "mute". | 214 | * Reserved area are considered as "mute". |
150 | * -> min = -79.5 dB | ||
151 | */ | 215 | */ |
152 | static const DECLARE_TLV_DB_SCALE(hp_out_tlv, -7950, 150, 1); | 216 | static const unsigned int hp_out_tlv[] = { |
217 | TLV_DB_RANGE_HEAD(2), | ||
218 | 0x0, 0x10, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1), | ||
219 | /* -54 dB to +15 dB */ | ||
220 | 0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0), | ||
221 | }; | ||
222 | |||
223 | static const unsigned int lineout_vol_tlv[] = { | ||
224 | TLV_DB_RANGE_HEAD(2), | ||
225 | 0x0, 0x10, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1), | ||
226 | /* -54dB to 15dB */ | ||
227 | 0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0) | ||
228 | }; | ||
229 | |||
230 | static const unsigned int mono_vol_tlv[] = { | ||
231 | TLV_DB_RANGE_HEAD(2), | ||
232 | 0x0, 0x2, TLV_DB_SCALE_ITEM(-1800, 0, 1), | ||
233 | /* -18dB to 6dB */ | ||
234 | 0x3, 0x7, TLV_DB_SCALE_ITEM(-1800, 600, 0) | ||
235 | }; | ||
236 | |||
237 | static const DECLARE_TLV_DB_SCALE(eq_gain_tlv, -1050, 150, 0); | ||
238 | static const DECLARE_TLV_DB_SCALE(adc_eq_master_gain_tlv, -1800, 600, 1); | ||
239 | static const DECLARE_TLV_DB_SCALE(dac_gain_tlv, -7725, 75, 0); | ||
240 | |||
241 | /* ADC and DAC high pass filter f0 value */ | ||
242 | static const char const *da7210_hpf_cutoff_txt[] = { | ||
243 | "Fs/8192*pi", "Fs/4096*pi", "Fs/2048*pi", "Fs/1024*pi" | ||
244 | }; | ||
245 | |||
246 | static const struct soc_enum da7210_dac_hpf_cutoff = | ||
247 | SOC_ENUM_SINGLE(DA7210_DAC_HPF, 0, 4, da7210_hpf_cutoff_txt); | ||
248 | |||
249 | static const struct soc_enum da7210_adc_hpf_cutoff = | ||
250 | SOC_ENUM_SINGLE(DA7210_ADC_HPF, 0, 4, da7210_hpf_cutoff_txt); | ||
251 | |||
252 | /* ADC and DAC voice (8kHz) high pass cutoff value */ | ||
253 | static const char const *da7210_vf_cutoff_txt[] = { | ||
254 | "2.5Hz", "25Hz", "50Hz", "100Hz", "150Hz", "200Hz", "300Hz", "400Hz" | ||
255 | }; | ||
256 | |||
257 | static const struct soc_enum da7210_dac_vf_cutoff = | ||
258 | SOC_ENUM_SINGLE(DA7210_DAC_HPF, 4, 8, da7210_vf_cutoff_txt); | ||
259 | |||
260 | static const struct soc_enum da7210_adc_vf_cutoff = | ||
261 | SOC_ENUM_SINGLE(DA7210_ADC_HPF, 4, 8, da7210_vf_cutoff_txt); | ||
262 | |||
263 | static const char *da7210_hp_mode_txt[] = { | ||
264 | "Class H", "Class G" | ||
265 | }; | ||
266 | |||
267 | static const struct soc_enum da7210_hp_mode_sel = | ||
268 | SOC_ENUM_SINGLE(DA7210_HP_CFG, 0, 2, da7210_hp_mode_txt); | ||
269 | |||
270 | /* ALC can be enabled only if noise suppression is disabled */ | ||
271 | static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol, | ||
272 | struct snd_ctl_elem_value *ucontrol) | ||
273 | { | ||
274 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
275 | |||
276 | if (ucontrol->value.integer.value[0]) { | ||
277 | /* Check if noise suppression is enabled */ | ||
278 | if (snd_soc_read(codec, DA7210_CONTROL) & DA7210_NOISE_SUP_EN) { | ||
279 | dev_dbg(codec->dev, | ||
280 | "Disable noise suppression to enable ALC\n"); | ||
281 | return -EINVAL; | ||
282 | } | ||
283 | } | ||
284 | /* If all conditions are met or we are actually disabling ALC */ | ||
285 | return snd_soc_put_volsw(kcontrol, ucontrol); | ||
286 | } | ||
287 | |||
288 | /* Noise suppression can be enabled only if following conditions are met | ||
289 | * ALC disabled | ||
290 | * ZC enabled for HP and AUX1 PGA | ||
291 | * INPGA_L_VOL and INPGA_R_VOL >= 10.5 dB | ||
292 | * AUX1_L_VOL and AUX1_R_VOL >= 6 dB | ||
293 | */ | ||
294 | static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol, | ||
295 | struct snd_ctl_elem_value *ucontrol) | ||
296 | { | ||
297 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
298 | u8 val; | ||
299 | |||
300 | if (ucontrol->value.integer.value[0]) { | ||
301 | /* Check if ALC is enabled */ | ||
302 | if (snd_soc_read(codec, DA7210_ADC) & DA7210_ADC_ALC_EN) | ||
303 | goto err; | ||
304 | |||
305 | /* Check ZC for HP and AUX1 PGA */ | ||
306 | if ((snd_soc_read(codec, DA7210_ZERO_CROSS) & | ||
307 | (DA7210_AUX1_L_ZC | DA7210_AUX1_R_ZC | DA7210_HP_L_ZC | | ||
308 | DA7210_HP_R_ZC)) != (DA7210_AUX1_L_ZC | | ||
309 | DA7210_AUX1_R_ZC | DA7210_HP_L_ZC | DA7210_HP_R_ZC)) | ||
310 | goto err; | ||
311 | |||
312 | /* Check INPGA_L_VOL and INPGA_R_VOL */ | ||
313 | val = snd_soc_read(codec, DA7210_IN_GAIN); | ||
314 | if (((val & DA7210_INPGA_L_VOL) < DA7210_INPGA_MIN_VOL_NS) || | ||
315 | (((val & DA7210_INPGA_R_VOL) >> 4) < | ||
316 | DA7210_INPGA_MIN_VOL_NS)) | ||
317 | goto err; | ||
318 | |||
319 | /* Check AUX1_L_VOL and AUX1_R_VOL */ | ||
320 | if (((snd_soc_read(codec, DA7210_AUX1_L) & DA7210_AUX1_L_VOL) < | ||
321 | DA7210_AUX1_MIN_VOL_NS) || | ||
322 | ((snd_soc_read(codec, DA7210_AUX1_R) & DA7210_AUX1_R_VOL) < | ||
323 | DA7210_AUX1_MIN_VOL_NS)) | ||
324 | goto err; | ||
325 | } | ||
326 | /* If all conditions are met or we are actually disabling Noise sup */ | ||
327 | return snd_soc_put_volsw(kcontrol, ucontrol); | ||
328 | |||
329 | err: | ||
330 | return -EINVAL; | ||
331 | } | ||
153 | 332 | ||
154 | static const struct snd_kcontrol_new da7210_snd_controls[] = { | 333 | static const struct snd_kcontrol_new da7210_snd_controls[] = { |
155 | 334 | ||
156 | SOC_DOUBLE_R_TLV("HeadPhone Playback Volume", | 335 | SOC_DOUBLE_R_TLV("HeadPhone Playback Volume", |
157 | DA7210_HP_L_VOL, DA7210_HP_R_VOL, | 336 | DA7210_HP_L_VOL, DA7210_HP_R_VOL, |
158 | 0, 0x3F, 0, hp_out_tlv), | 337 | 0, 0x3F, 0, hp_out_tlv), |
338 | SOC_DOUBLE_R_TLV("Digital Playback Volume", | ||
339 | DA7210_DAC_L, DA7210_DAC_R, | ||
340 | 0, 0x77, 1, dac_gain_tlv), | ||
341 | SOC_DOUBLE_R_TLV("Lineout Playback Volume", | ||
342 | DA7210_OUT1_L, DA7210_OUT1_R, | ||
343 | 0, 0x3f, 0, lineout_vol_tlv), | ||
344 | SOC_SINGLE_TLV("Mono Playback Volume", DA7210_OUT2, 0, 0x7, 0, | ||
345 | mono_vol_tlv), | ||
346 | |||
347 | /* DAC Equalizer controls */ | ||
348 | SOC_SINGLE("DAC EQ Switch", DA7210_DAC_EQ5, 7, 1, 0), | ||
349 | SOC_SINGLE_TLV("DAC EQ1 Volume", DA7210_DAC_EQ1_2, 0, 0xf, 1, | ||
350 | eq_gain_tlv), | ||
351 | SOC_SINGLE_TLV("DAC EQ2 Volume", DA7210_DAC_EQ1_2, 4, 0xf, 1, | ||
352 | eq_gain_tlv), | ||
353 | SOC_SINGLE_TLV("DAC EQ3 Volume", DA7210_DAC_EQ3_4, 0, 0xf, 1, | ||
354 | eq_gain_tlv), | ||
355 | SOC_SINGLE_TLV("DAC EQ4 Volume", DA7210_DAC_EQ3_4, 4, 0xf, 1, | ||
356 | eq_gain_tlv), | ||
357 | SOC_SINGLE_TLV("DAC EQ5 Volume", DA7210_DAC_EQ5, 0, 0xf, 1, | ||
358 | eq_gain_tlv), | ||
359 | |||
360 | /* ADC Equalizer controls */ | ||
361 | SOC_SINGLE("ADC EQ Switch", DA7210_ADC_EQ5, 7, 1, 0), | ||
362 | SOC_SINGLE_TLV("ADC EQ Master Volume", DA7210_ADC_EQ5, 4, 0x3, | ||
363 | 1, adc_eq_master_gain_tlv), | ||
364 | SOC_SINGLE_TLV("ADC EQ1 Volume", DA7210_ADC_EQ1_2, 0, 0xf, 1, | ||
365 | eq_gain_tlv), | ||
366 | SOC_SINGLE_TLV("ADC EQ2 Volume", DA7210_ADC_EQ1_2, 4, 0xf, 1, | ||
367 | eq_gain_tlv), | ||
368 | SOC_SINGLE_TLV("ADC EQ3 Volume", DA7210_ADC_EQ3_4, 0, 0xf, 1, | ||
369 | eq_gain_tlv), | ||
370 | SOC_SINGLE_TLV("ADC EQ4 Volume", DA7210_ADC_EQ3_4, 4, 0xf, 1, | ||
371 | eq_gain_tlv), | ||
372 | SOC_SINGLE_TLV("ADC EQ5 Volume", DA7210_ADC_EQ5, 0, 0xf, 1, | ||
373 | eq_gain_tlv), | ||
374 | |||
375 | SOC_SINGLE("DAC HPF Switch", DA7210_DAC_HPF, 3, 1, 0), | ||
376 | SOC_ENUM("DAC HPF Cutoff", da7210_dac_hpf_cutoff), | ||
377 | SOC_SINGLE("DAC Voice Mode Switch", DA7210_DAC_HPF, 7, 1, 0), | ||
378 | SOC_ENUM("DAC Voice Cutoff", da7210_dac_vf_cutoff), | ||
379 | |||
380 | SOC_SINGLE("ADC HPF Switch", DA7210_ADC_HPF, 3, 1, 0), | ||
381 | SOC_ENUM("ADC HPF Cutoff", da7210_adc_hpf_cutoff), | ||
382 | SOC_SINGLE("ADC Voice Mode Switch", DA7210_ADC_HPF, 7, 1, 0), | ||
383 | SOC_ENUM("ADC Voice Cutoff", da7210_adc_vf_cutoff), | ||
384 | |||
385 | /* Mute controls */ | ||
386 | SOC_DOUBLE_R("Mic Capture Switch", DA7210_MIC_L, DA7210_MIC_R, 3, 1, 0), | ||
387 | SOC_SINGLE("Aux2 Capture Switch", DA7210_AUX2, 2, 1, 0), | ||
388 | SOC_DOUBLE("ADC Capture Switch", DA7210_ADC, 2, 6, 1, 0), | ||
389 | SOC_SINGLE("Digital Soft Mute Switch", DA7210_SOFTMUTE, 7, 1, 0), | ||
390 | SOC_SINGLE("Digital Soft Mute Rate", DA7210_SOFTMUTE, 0, 0x7, 0), | ||
391 | |||
392 | /* Zero cross controls */ | ||
393 | SOC_DOUBLE("Aux1 ZC Switch", DA7210_ZERO_CROSS, 0, 1, 1, 0), | ||
394 | SOC_DOUBLE("In PGA ZC Switch", DA7210_ZERO_CROSS, 2, 3, 1, 0), | ||
395 | SOC_DOUBLE("Lineout ZC Switch", DA7210_ZERO_CROSS, 4, 5, 1, 0), | ||
396 | SOC_DOUBLE("Headphone ZC Switch", DA7210_ZERO_CROSS, 6, 7, 1, 0), | ||
397 | |||
398 | SOC_ENUM("Headphone Class", da7210_hp_mode_sel), | ||
399 | |||
400 | /* ALC controls */ | ||
401 | SOC_SINGLE_EXT("ALC Enable Switch", DA7210_ADC, 0, 1, 0, | ||
402 | snd_soc_get_volsw, da7210_put_alc_sw), | ||
403 | SOC_SINGLE("ALC Capture Max Volume", DA7210_ALC_MAX, 0, 0x3F, 0), | ||
404 | SOC_SINGLE("ALC Capture Min Volume", DA7210_ALC_MIN, 0, 0x3F, 0), | ||
405 | SOC_SINGLE("ALC Capture Noise Volume", DA7210_ALC_NOIS, 0, 0x3F, 0), | ||
406 | SOC_SINGLE("ALC Capture Attack Rate", DA7210_ALC_ATT, 0, 0xFF, 0), | ||
407 | SOC_SINGLE("ALC Capture Release Rate", DA7210_ALC_REL, 0, 0xFF, 0), | ||
408 | SOC_SINGLE("ALC Capture Release Delay", DA7210_ALC_DEL, 0, 0xFF, 0), | ||
409 | |||
410 | SOC_SINGLE_EXT("Noise Suppression Enable Switch", DA7210_CONTROL, 3, 1, | ||
411 | 0, snd_soc_get_volsw, da7210_put_noise_sup_sw), | ||
412 | }; | ||
413 | |||
414 | /* | ||
415 | * DAPM Controls | ||
416 | * | ||
417 | * Current DAPM implementation covers almost all codec components e.g. IOs, | ||
418 | * mixers, PGAs,ADC and DAC. | ||
419 | */ | ||
420 | /* In Mixer Left */ | ||
421 | static const struct snd_kcontrol_new da7210_dapm_inmixl_controls[] = { | ||
422 | SOC_DAPM_SINGLE("Mic Left Switch", DA7210_INMIX_L, 0, 1, 0), | ||
423 | SOC_DAPM_SINGLE("Mic Right Switch", DA7210_INMIX_L, 1, 1, 0), | ||
424 | }; | ||
425 | |||
426 | /* In Mixer Right */ | ||
427 | static const struct snd_kcontrol_new da7210_dapm_inmixr_controls[] = { | ||
428 | SOC_DAPM_SINGLE("Mic Right Switch", DA7210_INMIX_R, 0, 1, 0), | ||
429 | SOC_DAPM_SINGLE("Mic Left Switch", DA7210_INMIX_R, 1, 1, 0), | ||
430 | }; | ||
431 | |||
432 | /* Out Mixer Left */ | ||
433 | static const struct snd_kcontrol_new da7210_dapm_outmixl_controls[] = { | ||
434 | SOC_DAPM_SINGLE("DAC Left Switch", DA7210_OUTMIX_L, 4, 1, 0), | ||
435 | }; | ||
436 | |||
437 | /* Out Mixer Right */ | ||
438 | static const struct snd_kcontrol_new da7210_dapm_outmixr_controls[] = { | ||
439 | SOC_DAPM_SINGLE("DAC Right Switch", DA7210_OUTMIX_R, 4, 1, 0), | ||
440 | }; | ||
441 | |||
442 | /* Mono Mixer */ | ||
443 | static const struct snd_kcontrol_new da7210_dapm_monomix_controls[] = { | ||
444 | SOC_DAPM_SINGLE("Outmix Right Switch", DA7210_OUT2, 5, 1, 0), | ||
445 | SOC_DAPM_SINGLE("Outmix Left Switch", DA7210_OUT2, 6, 1, 0), | ||
446 | }; | ||
447 | |||
448 | /* DAPM widgets */ | ||
449 | static const struct snd_soc_dapm_widget da7210_dapm_widgets[] = { | ||
450 | /* Input Side */ | ||
451 | /* Input Lines */ | ||
452 | SND_SOC_DAPM_INPUT("MICL"), | ||
453 | SND_SOC_DAPM_INPUT("MICR"), | ||
454 | |||
455 | /* Input PGAs */ | ||
456 | SND_SOC_DAPM_PGA("Mic Left", DA7210_STARTUP3, 0, 1, NULL, 0), | ||
457 | SND_SOC_DAPM_PGA("Mic Right", DA7210_STARTUP3, 1, 1, NULL, 0), | ||
458 | |||
459 | SND_SOC_DAPM_PGA("INPGA Left", DA7210_INMIX_L, 7, 0, NULL, 0), | ||
460 | SND_SOC_DAPM_PGA("INPGA Right", DA7210_INMIX_R, 7, 0, NULL, 0), | ||
461 | |||
462 | /* Input Mixers */ | ||
463 | SND_SOC_DAPM_MIXER("In Mixer Left", SND_SOC_NOPM, 0, 0, | ||
464 | &da7210_dapm_inmixl_controls[0], | ||
465 | ARRAY_SIZE(da7210_dapm_inmixl_controls)), | ||
466 | |||
467 | SND_SOC_DAPM_MIXER("In Mixer Right", SND_SOC_NOPM, 0, 0, | ||
468 | &da7210_dapm_inmixr_controls[0], | ||
469 | ARRAY_SIZE(da7210_dapm_inmixr_controls)), | ||
470 | |||
471 | /* ADCs */ | ||
472 | SND_SOC_DAPM_ADC("ADC Left", "Capture", DA7210_STARTUP3, 5, 1), | ||
473 | SND_SOC_DAPM_ADC("ADC Right", "Capture", DA7210_STARTUP3, 6, 1), | ||
474 | |||
475 | /* Output Side */ | ||
476 | /* DACs */ | ||
477 | SND_SOC_DAPM_DAC("DAC Left", "Playback", DA7210_STARTUP2, 5, 1), | ||
478 | SND_SOC_DAPM_DAC("DAC Right", "Playback", DA7210_STARTUP2, 6, 1), | ||
479 | |||
480 | /* Output Mixers */ | ||
481 | SND_SOC_DAPM_MIXER("Out Mixer Left", SND_SOC_NOPM, 0, 0, | ||
482 | &da7210_dapm_outmixl_controls[0], | ||
483 | ARRAY_SIZE(da7210_dapm_outmixl_controls)), | ||
484 | |||
485 | SND_SOC_DAPM_MIXER("Out Mixer Right", SND_SOC_NOPM, 0, 0, | ||
486 | &da7210_dapm_outmixr_controls[0], | ||
487 | ARRAY_SIZE(da7210_dapm_outmixr_controls)), | ||
488 | |||
489 | SND_SOC_DAPM_MIXER("Mono Mixer", SND_SOC_NOPM, 0, 0, | ||
490 | &da7210_dapm_monomix_controls[0], | ||
491 | ARRAY_SIZE(da7210_dapm_monomix_controls)), | ||
492 | |||
493 | /* Output PGAs */ | ||
494 | SND_SOC_DAPM_PGA("OUTPGA Left Enable", DA7210_OUTMIX_L, 7, 0, NULL, 0), | ||
495 | SND_SOC_DAPM_PGA("OUTPGA Right Enable", DA7210_OUTMIX_R, 7, 0, NULL, 0), | ||
496 | |||
497 | SND_SOC_DAPM_PGA("Out1 Left", DA7210_STARTUP2, 0, 1, NULL, 0), | ||
498 | SND_SOC_DAPM_PGA("Out1 Right", DA7210_STARTUP2, 1, 1, NULL, 0), | ||
499 | SND_SOC_DAPM_PGA("Out2 Mono", DA7210_STARTUP2, 2, 1, NULL, 0), | ||
500 | SND_SOC_DAPM_PGA("Headphone Left", DA7210_STARTUP2, 3, 1, NULL, 0), | ||
501 | SND_SOC_DAPM_PGA("Headphone Right", DA7210_STARTUP2, 4, 1, NULL, 0), | ||
502 | |||
503 | /* Output Lines */ | ||
504 | SND_SOC_DAPM_OUTPUT("OUT1L"), | ||
505 | SND_SOC_DAPM_OUTPUT("OUT1R"), | ||
506 | SND_SOC_DAPM_OUTPUT("HPL"), | ||
507 | SND_SOC_DAPM_OUTPUT("HPR"), | ||
508 | SND_SOC_DAPM_OUTPUT("OUT2"), | ||
509 | }; | ||
510 | |||
511 | /* DAPM audio route definition */ | ||
512 | static const struct snd_soc_dapm_route da7210_audio_map[] = { | ||
513 | /* Dest Connecting Widget source */ | ||
514 | /* Input path */ | ||
515 | {"Mic Left", NULL, "MICL"}, | ||
516 | {"Mic Right", NULL, "MICR"}, | ||
517 | |||
518 | {"In Mixer Left", "Mic Left Switch", "Mic Left"}, | ||
519 | {"In Mixer Left", "Mic Right Switch", "Mic Right"}, | ||
520 | |||
521 | {"In Mixer Right", "Mic Right Switch", "Mic Right"}, | ||
522 | {"In Mixer Right", "Mic Left Switch", "Mic Left"}, | ||
523 | |||
524 | {"INPGA Left", NULL, "In Mixer Left"}, | ||
525 | {"ADC Left", NULL, "INPGA Left"}, | ||
526 | |||
527 | {"INPGA Right", NULL, "In Mixer Right"}, | ||
528 | {"ADC Right", NULL, "INPGA Right"}, | ||
529 | |||
530 | /* Output path */ | ||
531 | {"Out Mixer Left", "DAC Left Switch", "DAC Left"}, | ||
532 | {"Out Mixer Right", "DAC Right Switch", "DAC Right"}, | ||
533 | |||
534 | {"Mono Mixer", "Outmix Right Switch", "Out Mixer Right"}, | ||
535 | {"Mono Mixer", "Outmix Left Switch", "Out Mixer Left"}, | ||
536 | |||
537 | {"OUTPGA Left Enable", NULL, "Out Mixer Left"}, | ||
538 | {"OUTPGA Right Enable", NULL, "Out Mixer Right"}, | ||
539 | |||
540 | {"Out1 Left", NULL, "OUTPGA Left Enable"}, | ||
541 | {"OUT1L", NULL, "Out1 Left"}, | ||
542 | |||
543 | {"Out1 Right", NULL, "OUTPGA Right Enable"}, | ||
544 | {"OUT1R", NULL, "Out1 Right"}, | ||
545 | |||
546 | {"Headphone Left", NULL, "OUTPGA Left Enable"}, | ||
547 | {"HPL", NULL, "Headphone Left"}, | ||
548 | |||
549 | {"Headphone Right", NULL, "OUTPGA Right Enable"}, | ||
550 | {"HPR", NULL, "Headphone Right"}, | ||
551 | |||
552 | {"Out2 Mono", NULL, "Mono Mixer"}, | ||
553 | {"OUT2", NULL, "Out2 Mono"}, | ||
159 | }; | 554 | }; |
160 | 555 | ||
161 | /* Codec private data */ | 556 | /* Codec private data */ |
162 | struct da7210_priv { | 557 | struct da7210_priv { |
163 | enum snd_soc_control_type control_type; | 558 | enum snd_soc_control_type control_type; |
164 | void *control_data; | ||
165 | }; | 559 | }; |
166 | 560 | ||
167 | /* | 561 | /* |
@@ -188,72 +582,15 @@ static const u8 da7210_reg[] = { | |||
188 | 0x00, /* R88 */ | 582 | 0x00, /* R88 */ |
189 | }; | 583 | }; |
190 | 584 | ||
191 | /* | 585 | static int da7210_volatile_register(struct snd_soc_codec *codec, |
192 | * Read da7210 register cache | 586 | unsigned int reg) |
193 | */ | ||
194 | static inline u32 da7210_read_reg_cache(struct snd_soc_codec *codec, u32 reg) | ||
195 | { | ||
196 | u8 *cache = codec->reg_cache; | ||
197 | BUG_ON(reg >= ARRAY_SIZE(da7210_reg)); | ||
198 | return cache[reg]; | ||
199 | } | ||
200 | |||
201 | /* | ||
202 | * Write to the da7210 register space | ||
203 | */ | ||
204 | static int da7210_write(struct snd_soc_codec *codec, u32 reg, u32 value) | ||
205 | { | 587 | { |
206 | u8 *cache = codec->reg_cache; | 588 | switch (reg) { |
207 | u8 data[2]; | 589 | case DA7210_STATUS: |
208 | 590 | return 1; | |
209 | BUG_ON(codec->driver->volatile_register); | 591 | default: |
210 | 592 | return 0; | |
211 | data[0] = reg & 0xff; | ||
212 | data[1] = value & 0xff; | ||
213 | |||
214 | if (reg >= codec->driver->reg_cache_size) | ||
215 | return -EIO; | ||
216 | |||
217 | if (2 != codec->hw_write(codec->control_data, data, 2)) | ||
218 | return -EIO; | ||
219 | |||
220 | cache[reg] = value; | ||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | /* | ||
225 | * Read from the da7210 register space. | ||
226 | */ | ||
227 | static inline u32 da7210_read(struct snd_soc_codec *codec, u32 reg) | ||
228 | { | ||
229 | if (DA7210_STATUS == reg) | ||
230 | return i2c_smbus_read_byte_data(codec->control_data, reg); | ||
231 | |||
232 | return da7210_read_reg_cache(codec, reg); | ||
233 | } | ||
234 | |||
235 | static int da7210_startup(struct snd_pcm_substream *substream, | ||
236 | struct snd_soc_dai *dai) | ||
237 | { | ||
238 | int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; | ||
239 | struct snd_soc_codec *codec = dai->codec; | ||
240 | |||
241 | if (is_play) { | ||
242 | /* Enable Out */ | ||
243 | snd_soc_update_bits(codec, DA7210_OUTMIX_L, 0x1F, 0x10); | ||
244 | snd_soc_update_bits(codec, DA7210_OUTMIX_R, 0x1F, 0x10); | ||
245 | |||
246 | } else { | ||
247 | /* Volume 7 */ | ||
248 | snd_soc_update_bits(codec, DA7210_MIC_L, 0x7, 0x7); | ||
249 | snd_soc_update_bits(codec, DA7210_MIC_R, 0x7, 0x7); | ||
250 | |||
251 | /* Enable Mic */ | ||
252 | snd_soc_update_bits(codec, DA7210_INMIX_L, 0x1F, 0x1); | ||
253 | snd_soc_update_bits(codec, DA7210_INMIX_R, 0x1F, 0x1); | ||
254 | } | 593 | } |
255 | |||
256 | return 0; | ||
257 | } | 594 | } |
258 | 595 | ||
259 | /* | 596 | /* |
@@ -266,93 +603,75 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, | |||
266 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 603 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
267 | struct snd_soc_codec *codec = rtd->codec; | 604 | struct snd_soc_codec *codec = rtd->codec; |
268 | u32 dai_cfg1; | 605 | u32 dai_cfg1; |
269 | u32 hpf_reg, hpf_mask, hpf_value; | ||
270 | u32 fs, bypass; | 606 | u32 fs, bypass; |
271 | 607 | ||
272 | /* set DAI source to Left and Right ADC */ | 608 | /* set DAI source to Left and Right ADC */ |
273 | da7210_write(codec, DA7210_DAI_SRC_SEL, | 609 | snd_soc_write(codec, DA7210_DAI_SRC_SEL, |
274 | DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC); | 610 | DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC); |
275 | 611 | ||
276 | /* Enable DAI */ | 612 | /* Enable DAI */ |
277 | da7210_write(codec, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN); | 613 | snd_soc_write(codec, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN); |
278 | 614 | ||
279 | dai_cfg1 = 0xFC & da7210_read(codec, DA7210_DAI_CFG1); | 615 | dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1); |
280 | 616 | ||
281 | switch (params_format(params)) { | 617 | switch (params_format(params)) { |
282 | case SNDRV_PCM_FORMAT_S16_LE: | 618 | case SNDRV_PCM_FORMAT_S16_LE: |
283 | dai_cfg1 |= DA7210_DAI_WORD_S16_LE; | 619 | dai_cfg1 |= DA7210_DAI_WORD_S16_LE; |
284 | break; | 620 | break; |
621 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
622 | dai_cfg1 |= DA7210_DAI_WORD_S20_3LE; | ||
623 | break; | ||
285 | case SNDRV_PCM_FORMAT_S24_LE: | 624 | case SNDRV_PCM_FORMAT_S24_LE: |
286 | dai_cfg1 |= DA7210_DAI_WORD_S24_LE; | 625 | dai_cfg1 |= DA7210_DAI_WORD_S24_LE; |
287 | break; | 626 | break; |
627 | case SNDRV_PCM_FORMAT_S32_LE: | ||
628 | dai_cfg1 |= DA7210_DAI_WORD_S32_LE; | ||
629 | break; | ||
288 | default: | 630 | default: |
289 | return -EINVAL; | 631 | return -EINVAL; |
290 | } | 632 | } |
291 | 633 | ||
292 | da7210_write(codec, DA7210_DAI_CFG1, dai_cfg1); | 634 | snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1); |
293 | |||
294 | hpf_reg = (SNDRV_PCM_STREAM_PLAYBACK == substream->stream) ? | ||
295 | DA7210_DAC_HPF : DA7210_ADC_HPF; | ||
296 | 635 | ||
297 | switch (params_rate(params)) { | 636 | switch (params_rate(params)) { |
298 | case 8000: | 637 | case 8000: |
299 | fs = DA7210_PLL_FS_8000; | 638 | fs = DA7210_PLL_FS_8000; |
300 | hpf_mask = DA7210_VOICE_F0_MASK | DA7210_VOICE_EN; | ||
301 | hpf_value = DA7210_VOICE_F0_25 | DA7210_VOICE_EN; | ||
302 | bypass = DA7210_PLL_BYP; | 639 | bypass = DA7210_PLL_BYP; |
303 | break; | 640 | break; |
304 | case 11025: | 641 | case 11025: |
305 | fs = DA7210_PLL_FS_11025; | 642 | fs = DA7210_PLL_FS_11025; |
306 | hpf_mask = DA7210_VOICE_F0_MASK | DA7210_VOICE_EN; | ||
307 | hpf_value = DA7210_VOICE_F0_25 | DA7210_VOICE_EN; | ||
308 | bypass = 0; | 643 | bypass = 0; |
309 | break; | 644 | break; |
310 | case 12000: | 645 | case 12000: |
311 | fs = DA7210_PLL_FS_12000; | 646 | fs = DA7210_PLL_FS_12000; |
312 | hpf_mask = DA7210_VOICE_F0_MASK | DA7210_VOICE_EN; | ||
313 | hpf_value = DA7210_VOICE_F0_25 | DA7210_VOICE_EN; | ||
314 | bypass = DA7210_PLL_BYP; | 647 | bypass = DA7210_PLL_BYP; |
315 | break; | 648 | break; |
316 | case 16000: | 649 | case 16000: |
317 | fs = DA7210_PLL_FS_16000; | 650 | fs = DA7210_PLL_FS_16000; |
318 | hpf_mask = DA7210_VOICE_F0_MASK | DA7210_VOICE_EN; | ||
319 | hpf_value = DA7210_VOICE_F0_25 | DA7210_VOICE_EN; | ||
320 | bypass = DA7210_PLL_BYP; | 651 | bypass = DA7210_PLL_BYP; |
321 | break; | 652 | break; |
322 | case 22050: | 653 | case 22050: |
323 | fs = DA7210_PLL_FS_22050; | 654 | fs = DA7210_PLL_FS_22050; |
324 | hpf_mask = DA7210_VOICE_EN; | ||
325 | hpf_value = 0; | ||
326 | bypass = 0; | 655 | bypass = 0; |
327 | break; | 656 | break; |
328 | case 32000: | 657 | case 32000: |
329 | fs = DA7210_PLL_FS_32000; | 658 | fs = DA7210_PLL_FS_32000; |
330 | hpf_mask = DA7210_VOICE_EN; | ||
331 | hpf_value = 0; | ||
332 | bypass = DA7210_PLL_BYP; | 659 | bypass = DA7210_PLL_BYP; |
333 | break; | 660 | break; |
334 | case 44100: | 661 | case 44100: |
335 | fs = DA7210_PLL_FS_44100; | 662 | fs = DA7210_PLL_FS_44100; |
336 | hpf_mask = DA7210_VOICE_EN; | ||
337 | hpf_value = 0; | ||
338 | bypass = 0; | 663 | bypass = 0; |
339 | break; | 664 | break; |
340 | case 48000: | 665 | case 48000: |
341 | fs = DA7210_PLL_FS_48000; | 666 | fs = DA7210_PLL_FS_48000; |
342 | hpf_mask = DA7210_VOICE_EN; | ||
343 | hpf_value = 0; | ||
344 | bypass = DA7210_PLL_BYP; | 667 | bypass = DA7210_PLL_BYP; |
345 | break; | 668 | break; |
346 | case 88200: | 669 | case 88200: |
347 | fs = DA7210_PLL_FS_88200; | 670 | fs = DA7210_PLL_FS_88200; |
348 | hpf_mask = DA7210_VOICE_EN; | ||
349 | hpf_value = 0; | ||
350 | bypass = 0; | 671 | bypass = 0; |
351 | break; | 672 | break; |
352 | case 96000: | 673 | case 96000: |
353 | fs = DA7210_PLL_FS_96000; | 674 | fs = DA7210_PLL_FS_96000; |
354 | hpf_mask = DA7210_VOICE_EN; | ||
355 | hpf_value = 0; | ||
356 | bypass = DA7210_PLL_BYP; | 675 | bypass = DA7210_PLL_BYP; |
357 | break; | 676 | break; |
358 | default: | 677 | default: |
@@ -362,7 +681,6 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, | |||
362 | /* Disable active mode */ | 681 | /* Disable active mode */ |
363 | snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0); | 682 | snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0); |
364 | 683 | ||
365 | snd_soc_update_bits(codec, hpf_reg, hpf_mask, hpf_value); | ||
366 | snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_FS_MASK, fs); | 684 | snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_FS_MASK, fs); |
367 | snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, bypass); | 685 | snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, bypass); |
368 | 686 | ||
@@ -382,13 +700,16 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) | |||
382 | u32 dai_cfg1; | 700 | u32 dai_cfg1; |
383 | u32 dai_cfg3; | 701 | u32 dai_cfg3; |
384 | 702 | ||
385 | dai_cfg1 = 0x7f & da7210_read(codec, DA7210_DAI_CFG1); | 703 | dai_cfg1 = 0x7f & snd_soc_read(codec, DA7210_DAI_CFG1); |
386 | dai_cfg3 = 0xfc & da7210_read(codec, DA7210_DAI_CFG3); | 704 | dai_cfg3 = 0xfc & snd_soc_read(codec, DA7210_DAI_CFG3); |
387 | 705 | ||
388 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | 706 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
389 | case SND_SOC_DAIFMT_CBM_CFM: | 707 | case SND_SOC_DAIFMT_CBM_CFM: |
390 | dai_cfg1 |= DA7210_DAI_MODE_MASTER; | 708 | dai_cfg1 |= DA7210_DAI_MODE_MASTER; |
391 | break; | 709 | break; |
710 | case SND_SOC_DAIFMT_CBS_CFS: | ||
711 | dai_cfg1 |= DA7210_DAI_MODE_SLAVE; | ||
712 | break; | ||
392 | default: | 713 | default: |
393 | return -EINVAL; | 714 | return -EINVAL; |
394 | } | 715 | } |
@@ -401,6 +722,12 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) | |||
401 | case SND_SOC_DAIFMT_I2S: | 722 | case SND_SOC_DAIFMT_I2S: |
402 | dai_cfg3 |= DA7210_DAI_FORMAT_I2SMODE; | 723 | dai_cfg3 |= DA7210_DAI_FORMAT_I2SMODE; |
403 | break; | 724 | break; |
725 | case SND_SOC_DAIFMT_LEFT_J: | ||
726 | dai_cfg3 |= DA7210_DAI_FORMAT_LEFT_J; | ||
727 | break; | ||
728 | case SND_SOC_DAIFMT_RIGHT_J: | ||
729 | dai_cfg3 |= DA7210_DAI_FORMAT_RIGHT_J; | ||
730 | break; | ||
404 | default: | 731 | default: |
405 | return -EINVAL; | 732 | return -EINVAL; |
406 | } | 733 | } |
@@ -411,19 +738,32 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) | |||
411 | */ | 738 | */ |
412 | dai_cfg1 |= DA7210_DAI_FLEN_64BIT; | 739 | dai_cfg1 |= DA7210_DAI_FLEN_64BIT; |
413 | 740 | ||
414 | da7210_write(codec, DA7210_DAI_CFG1, dai_cfg1); | 741 | snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1); |
415 | da7210_write(codec, DA7210_DAI_CFG3, dai_cfg3); | 742 | snd_soc_write(codec, DA7210_DAI_CFG3, dai_cfg3); |
743 | |||
744 | return 0; | ||
745 | } | ||
746 | |||
747 | static int da7210_mute(struct snd_soc_dai *dai, int mute) | ||
748 | { | ||
749 | struct snd_soc_codec *codec = dai->codec; | ||
750 | u8 mute_reg = snd_soc_read(codec, DA7210_DAC_HPF) & 0xFB; | ||
416 | 751 | ||
752 | if (mute) | ||
753 | snd_soc_write(codec, DA7210_DAC_HPF, mute_reg | 0x4); | ||
754 | else | ||
755 | snd_soc_write(codec, DA7210_DAC_HPF, mute_reg); | ||
417 | return 0; | 756 | return 0; |
418 | } | 757 | } |
419 | 758 | ||
420 | #define DA7210_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) | 759 | #define DA7210_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
760 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) | ||
421 | 761 | ||
422 | /* DAI operations */ | 762 | /* DAI operations */ |
423 | static struct snd_soc_dai_ops da7210_dai_ops = { | 763 | static struct snd_soc_dai_ops da7210_dai_ops = { |
424 | .startup = da7210_startup, | ||
425 | .hw_params = da7210_hw_params, | 764 | .hw_params = da7210_hw_params, |
426 | .set_fmt = da7210_set_dai_fmt, | 765 | .set_fmt = da7210_set_dai_fmt, |
766 | .digital_mute = da7210_mute, | ||
427 | }; | 767 | }; |
428 | 768 | ||
429 | static struct snd_soc_dai_driver da7210_dai = { | 769 | static struct snd_soc_dai_driver da7210_dai = { |
@@ -451,11 +791,15 @@ static struct snd_soc_dai_driver da7210_dai = { | |||
451 | static int da7210_probe(struct snd_soc_codec *codec) | 791 | static int da7210_probe(struct snd_soc_codec *codec) |
452 | { | 792 | { |
453 | struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); | 793 | struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); |
794 | int ret; | ||
454 | 795 | ||
455 | dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); | 796 | dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); |
456 | 797 | ||
457 | codec->control_data = da7210->control_data; | 798 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, da7210->control_type); |
458 | codec->hw_write = (hw_write_t)i2c_master_send; | 799 | if (ret < 0) { |
800 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
801 | return ret; | ||
802 | } | ||
459 | 803 | ||
460 | /* FIXME | 804 | /* FIXME |
461 | * | 805 | * |
@@ -472,8 +816,8 @@ static int da7210_probe(struct snd_soc_codec *codec) | |||
472 | /* | 816 | /* |
473 | * make sure that DA7210 use bypass mode before start up | 817 | * make sure that DA7210 use bypass mode before start up |
474 | */ | 818 | */ |
475 | da7210_write(codec, DA7210_STARTUP1, 0); | 819 | snd_soc_write(codec, DA7210_STARTUP1, 0); |
476 | da7210_write(codec, DA7210_PLL_DIV3, | 820 | snd_soc_write(codec, DA7210_PLL_DIV3, |
477 | DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); | 821 | DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); |
478 | 822 | ||
479 | /* | 823 | /* |
@@ -481,36 +825,70 @@ static int da7210_probe(struct snd_soc_codec *codec) | |||
481 | */ | 825 | */ |
482 | 826 | ||
483 | /* Enable Left & Right MIC PGA and Mic Bias */ | 827 | /* Enable Left & Right MIC PGA and Mic Bias */ |
484 | da7210_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN); | 828 | snd_soc_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN); |
485 | da7210_write(codec, DA7210_MIC_R, DA7210_MIC_R_EN); | 829 | snd_soc_write(codec, DA7210_MIC_R, DA7210_MIC_R_EN); |
486 | 830 | ||
487 | /* Enable Left and Right input PGA */ | 831 | /* Enable Left and Right input PGA */ |
488 | da7210_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN); | 832 | snd_soc_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN); |
489 | da7210_write(codec, DA7210_INMIX_R, DA7210_IN_R_EN); | 833 | snd_soc_write(codec, DA7210_INMIX_R, DA7210_IN_R_EN); |
490 | 834 | ||
491 | /* Enable Left and Right ADC */ | 835 | /* Enable Left and Right ADC */ |
492 | da7210_write(codec, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN); | 836 | snd_soc_write(codec, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN); |
493 | 837 | ||
494 | /* | 838 | /* |
495 | * DAC settings | 839 | * DAC settings |
496 | */ | 840 | */ |
497 | 841 | ||
498 | /* Enable Left and Right DAC */ | 842 | /* Enable Left and Right DAC */ |
499 | da7210_write(codec, DA7210_DAC_SEL, | 843 | snd_soc_write(codec, DA7210_DAC_SEL, |
500 | DA7210_DAC_L_SRC_DAI_L | DA7210_DAC_L_EN | | 844 | DA7210_DAC_L_SRC_DAI_L | DA7210_DAC_L_EN | |
501 | DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN); | 845 | DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN); |
502 | 846 | ||
503 | /* Enable Left and Right out PGA */ | 847 | /* Enable Left and Right out PGA */ |
504 | da7210_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN); | 848 | snd_soc_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN); |
505 | da7210_write(codec, DA7210_OUTMIX_R, DA7210_OUT_R_EN); | 849 | snd_soc_write(codec, DA7210_OUTMIX_R, DA7210_OUT_R_EN); |
506 | 850 | ||
507 | /* Enable Left and Right HeadPhone PGA */ | 851 | /* Enable Left and Right HeadPhone PGA */ |
508 | da7210_write(codec, DA7210_HP_CFG, | 852 | snd_soc_write(codec, DA7210_HP_CFG, |
509 | DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN | | 853 | DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN | |
510 | DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN); | 854 | DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN); |
511 | 855 | ||
856 | /* Enable ramp mode for DAC gain update */ | ||
857 | snd_soc_write(codec, DA7210_SOFTMUTE, DA7210_RAMP_EN); | ||
858 | |||
859 | /* | ||
860 | * For DA7210 codec, there are two ways to enable/disable analog IOs | ||
861 | * and ADC/DAC, | ||
862 | * (1) Using "Enable Bit" of register associated with that IO | ||
863 | * (or ADC/DAC) | ||
864 | * e.g. Mic Left can be enabled using bit 7 of MIC_L(0x7) reg | ||
865 | * | ||
866 | * (2) Using "Standby Bit" of STARTUP2 or STARTUP3 register | ||
867 | * e.g. Mic left can be put to STANDBY using bit 0 of STARTUP3(0x5) | ||
868 | * | ||
869 | * Out of these two methods, the one using STANDBY bits is preferred | ||
870 | * way to enable/disable individual blocks. This is because STANDBY | ||
871 | * registers are part of system controller which allows system power | ||
872 | * up/down in a controlled, pop-free manner. Also, as per application | ||
873 | * note of DA7210, STANDBY register bits are only effective if a | ||
874 | * particular IO (or ADC/DAC) is already enabled using enable/disable | ||
875 | * register bits. Keeping these things in mind, current DAPM | ||
876 | * implementation manipulates only STANDBY bits. | ||
877 | * | ||
878 | * Overall implementation can be outlined as below, | ||
879 | * | ||
880 | * - "Enable bit" of an IO or ADC/DAC is used to enable it in probe() | ||
881 | * - "STANDBY bit" is controlled by DAPM | ||
882 | */ | ||
883 | |||
884 | /* Enable Line out amplifiers */ | ||
885 | snd_soc_write(codec, DA7210_OUT1_L, DA7210_OUT1_L_EN); | ||
886 | snd_soc_write(codec, DA7210_OUT1_R, DA7210_OUT1_R_EN); | ||
887 | snd_soc_write(codec, DA7210_OUT2, DA7210_OUT2_EN | | ||
888 | DA7210_OUT2_OUTMIX_L | DA7210_OUT2_OUTMIX_R); | ||
889 | |||
512 | /* Diable PLL and bypass it */ | 890 | /* Diable PLL and bypass it */ |
513 | da7210_write(codec, DA7210_PLL, DA7210_PLL_FS_48000); | 891 | snd_soc_write(codec, DA7210_PLL, DA7210_PLL_FS_48000); |
514 | 892 | ||
515 | /* | 893 | /* |
516 | * If 48kHz sound came, it use bypass mode, | 894 | * If 48kHz sound came, it use bypass mode, |
@@ -521,25 +899,22 @@ static int da7210_probe(struct snd_soc_codec *codec) | |||
521 | * DA7210_PLL_DIV3 :: DA7210_PLL_BYP bit. | 899 | * DA7210_PLL_DIV3 :: DA7210_PLL_BYP bit. |
522 | * see da7210_hw_params | 900 | * see da7210_hw_params |
523 | */ | 901 | */ |
524 | da7210_write(codec, DA7210_PLL_DIV1, 0xE5); /* MCLK = 12.288MHz */ | 902 | snd_soc_write(codec, DA7210_PLL_DIV1, 0xE5); /* MCLK = 12.288MHz */ |
525 | da7210_write(codec, DA7210_PLL_DIV2, 0x99); | 903 | snd_soc_write(codec, DA7210_PLL_DIV2, 0x99); |
526 | da7210_write(codec, DA7210_PLL_DIV3, 0x0A | | 904 | snd_soc_write(codec, DA7210_PLL_DIV3, 0x0A | |
527 | DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); | 905 | DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); |
528 | snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); | 906 | snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); |
529 | 907 | ||
530 | /* As suggested by Dialog */ | 908 | /* As suggested by Dialog */ |
531 | da7210_write(codec, DA7210_A_HID_UNLOCK, 0x8B); /* unlock */ | 909 | snd_soc_write(codec, DA7210_A_HID_UNLOCK, 0x8B); /* unlock */ |
532 | da7210_write(codec, DA7210_A_TEST_UNLOCK, 0xB4); | 910 | snd_soc_write(codec, DA7210_A_TEST_UNLOCK, 0xB4); |
533 | da7210_write(codec, DA7210_A_PLL1, 0x01); | 911 | snd_soc_write(codec, DA7210_A_PLL1, 0x01); |
534 | da7210_write(codec, DA7210_A_CP_MODE, 0x7C); | 912 | snd_soc_write(codec, DA7210_A_CP_MODE, 0x7C); |
535 | da7210_write(codec, DA7210_A_HID_UNLOCK, 0x00); /* re-lock */ | 913 | snd_soc_write(codec, DA7210_A_HID_UNLOCK, 0x00); /* re-lock */ |
536 | da7210_write(codec, DA7210_A_TEST_UNLOCK, 0x00); | 914 | snd_soc_write(codec, DA7210_A_TEST_UNLOCK, 0x00); |
537 | 915 | ||
538 | /* Activate all enabled subsystem */ | 916 | /* Activate all enabled subsystem */ |
539 | da7210_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); | 917 | snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); |
540 | |||
541 | snd_soc_add_controls(codec, da7210_snd_controls, | ||
542 | ARRAY_SIZE(da7210_snd_controls)); | ||
543 | 918 | ||
544 | dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); | 919 | dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); |
545 | 920 | ||
@@ -548,11 +923,18 @@ static int da7210_probe(struct snd_soc_codec *codec) | |||
548 | 923 | ||
549 | static struct snd_soc_codec_driver soc_codec_dev_da7210 = { | 924 | static struct snd_soc_codec_driver soc_codec_dev_da7210 = { |
550 | .probe = da7210_probe, | 925 | .probe = da7210_probe, |
551 | .read = da7210_read, | ||
552 | .write = da7210_write, | ||
553 | .reg_cache_size = ARRAY_SIZE(da7210_reg), | 926 | .reg_cache_size = ARRAY_SIZE(da7210_reg), |
554 | .reg_word_size = sizeof(u8), | 927 | .reg_word_size = sizeof(u8), |
555 | .reg_cache_default = da7210_reg, | 928 | .reg_cache_default = da7210_reg, |
929 | .volatile_register = da7210_volatile_register, | ||
930 | |||
931 | .controls = da7210_snd_controls, | ||
932 | .num_controls = ARRAY_SIZE(da7210_snd_controls), | ||
933 | |||
934 | .dapm_widgets = da7210_dapm_widgets, | ||
935 | .num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets), | ||
936 | .dapm_routes = da7210_audio_map, | ||
937 | .num_dapm_routes = ARRAY_SIZE(da7210_audio_map), | ||
556 | }; | 938 | }; |
557 | 939 | ||
558 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 940 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
@@ -567,7 +949,6 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, | |||
567 | return -ENOMEM; | 949 | return -ENOMEM; |
568 | 950 | ||
569 | i2c_set_clientdata(i2c, da7210); | 951 | i2c_set_clientdata(i2c, da7210); |
570 | da7210->control_data = i2c; | ||
571 | da7210->control_type = SND_SOC_I2C; | 952 | da7210->control_type = SND_SOC_I2C; |
572 | 953 | ||
573 | ret = snd_soc_register_codec(&i2c->dev, | 954 | ret = snd_soc_register_codec(&i2c->dev, |