diff options
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/Kconfig | 3 | ||||
-rw-r--r-- | sound/soc/codecs/Makefile | 2 | ||||
-rw-r--r-- | sound/soc/codecs/ac97.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/cs4270.c | 262 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 1274 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.h | 181 | ||||
-rw-r--r-- | sound/soc/codecs/wm8731.c | 9 | ||||
-rw-r--r-- | sound/soc/codecs/wm8750.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/wm8753.c | 8 | ||||
-rw-r--r-- | sound/soc/codecs/wm9712.c | 10 |
10 files changed, 1603 insertions, 150 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 78248808a9d8..898a7d363284 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
@@ -37,3 +37,6 @@ config SND_SOC_CS4270_VD33_ERRATA | |||
37 | bool | 37 | bool |
38 | depends on SND_SOC_CS4270 | 38 | depends on SND_SOC_CS4270 |
39 | 39 | ||
40 | config SND_SOC_TLV320AIC3X | ||
41 | tristate | ||
42 | depends on SND_SOC && I2C | ||
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 7ad78e36d506..c6e5338c2666 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -4,6 +4,7 @@ snd-soc-wm8750-objs := wm8750.o | |||
4 | snd-soc-wm8753-objs := wm8753.o | 4 | snd-soc-wm8753-objs := wm8753.o |
5 | snd-soc-wm9712-objs := wm9712.o | 5 | snd-soc-wm9712-objs := wm9712.o |
6 | snd-soc-cs4270-objs := cs4270.o | 6 | snd-soc-cs4270-objs := cs4270.o |
7 | snd-soc-tlv320aic3x-objs := tlv320aic3x.o | ||
7 | 8 | ||
8 | obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o | 9 | obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o |
9 | obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o | 10 | obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o |
@@ -11,3 +12,4 @@ obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o | |||
11 | obj-$(CONFIG_SND_SOC_WM8753) += snd-soc-wm8753.o | 12 | obj-$(CONFIG_SND_SOC_WM8753) += snd-soc-wm8753.o |
12 | obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o | 13 | obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o |
13 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o | 14 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o |
15 | obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o | ||
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index 0b8a6f8b3668..242130cf1abd 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
22 | #include <sound/driver.h> | ||
23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
25 | #include <sound/ac97_codec.h> | 24 | #include <sound/ac97_codec.h> |
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index dab22cc97ead..bf2ab72d49bf 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <sound/driver.h> | ||
32 | #include <sound/core.h> | 31 | #include <sound/core.h> |
33 | #include <sound/soc.h> | 32 | #include <sound/soc.h> |
34 | #include <sound/initval.h> | 33 | #include <sound/initval.h> |
@@ -48,12 +47,130 @@ struct cs4270_private { | |||
48 | unsigned int mode; /* The mode (I2S or left-justified) */ | 47 | unsigned int mode; /* The mode (I2S or left-justified) */ |
49 | }; | 48 | }; |
50 | 49 | ||
51 | /* The number of MCLK/LRCK ratios supported by the CS4270 */ | 50 | /* |
52 | #define NUM_MCLK_RATIOS 9 | 51 | * The codec isn't really big-endian or little-endian, since the I2S |
52 | * interface requires data to be sent serially with the MSbit first. | ||
53 | * However, to support BE and LE I2S devices, we specify both here. That | ||
54 | * way, ALSA will always match the bit patterns. | ||
55 | */ | ||
56 | #define CS4270_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ | ||
57 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | \ | ||
58 | SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE | \ | ||
59 | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE | \ | ||
60 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | \ | ||
61 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE) | ||
62 | |||
63 | #ifdef USE_I2C | ||
64 | |||
65 | /* CS4270 registers addresses */ | ||
66 | #define CS4270_CHIPID 0x01 /* Chip ID */ | ||
67 | #define CS4270_PWRCTL 0x02 /* Power Control */ | ||
68 | #define CS4270_MODE 0x03 /* Mode Control */ | ||
69 | #define CS4270_FORMAT 0x04 /* Serial Format, ADC/DAC Control */ | ||
70 | #define CS4270_TRANS 0x05 /* Transition Control */ | ||
71 | #define CS4270_MUTE 0x06 /* Mute Control */ | ||
72 | #define CS4270_VOLA 0x07 /* DAC Channel A Volume Control */ | ||
73 | #define CS4270_VOLB 0x08 /* DAC Channel B Volume Control */ | ||
74 | |||
75 | #define CS4270_FIRSTREG 0x01 | ||
76 | #define CS4270_LASTREG 0x08 | ||
77 | #define CS4270_NUMREGS (CS4270_LASTREG - CS4270_FIRSTREG + 1) | ||
53 | 78 | ||
54 | /* The actual MCLK/LRCK ratios, in increasing numerical order */ | 79 | /* Bit masks for the CS4270 registers */ |
55 | static unsigned int mclk_ratios[NUM_MCLK_RATIOS] = | 80 | #define CS4270_CHIPID_ID 0xF0 |
56 | {64, 96, 128, 192, 256, 384, 512, 768, 1024}; | 81 | #define CS4270_CHIPID_REV 0x0F |
82 | #define CS4270_PWRCTL_FREEZE 0x80 | ||
83 | #define CS4270_PWRCTL_PDN_ADC 0x20 | ||
84 | #define CS4270_PWRCTL_PDN_DAC 0x02 | ||
85 | #define CS4270_PWRCTL_PDN 0x01 | ||
86 | #define CS4270_MODE_SPEED_MASK 0x30 | ||
87 | #define CS4270_MODE_1X 0x00 | ||
88 | #define CS4270_MODE_2X 0x10 | ||
89 | #define CS4270_MODE_4X 0x20 | ||
90 | #define CS4270_MODE_SLAVE 0x30 | ||
91 | #define CS4270_MODE_DIV_MASK 0x0E | ||
92 | #define CS4270_MODE_DIV1 0x00 | ||
93 | #define CS4270_MODE_DIV15 0x02 | ||
94 | #define CS4270_MODE_DIV2 0x04 | ||
95 | #define CS4270_MODE_DIV3 0x06 | ||
96 | #define CS4270_MODE_DIV4 0x08 | ||
97 | #define CS4270_MODE_POPGUARD 0x01 | ||
98 | #define CS4270_FORMAT_FREEZE_A 0x80 | ||
99 | #define CS4270_FORMAT_FREEZE_B 0x40 | ||
100 | #define CS4270_FORMAT_LOOPBACK 0x20 | ||
101 | #define CS4270_FORMAT_DAC_MASK 0x18 | ||
102 | #define CS4270_FORMAT_DAC_LJ 0x00 | ||
103 | #define CS4270_FORMAT_DAC_I2S 0x08 | ||
104 | #define CS4270_FORMAT_DAC_RJ16 0x18 | ||
105 | #define CS4270_FORMAT_DAC_RJ24 0x10 | ||
106 | #define CS4270_FORMAT_ADC_MASK 0x01 | ||
107 | #define CS4270_FORMAT_ADC_LJ 0x00 | ||
108 | #define CS4270_FORMAT_ADC_I2S 0x01 | ||
109 | #define CS4270_TRANS_ONE_VOL 0x80 | ||
110 | #define CS4270_TRANS_SOFT 0x40 | ||
111 | #define CS4270_TRANS_ZERO 0x20 | ||
112 | #define CS4270_TRANS_INV_ADC_A 0x08 | ||
113 | #define CS4270_TRANS_INV_ADC_B 0x10 | ||
114 | #define CS4270_TRANS_INV_DAC_A 0x02 | ||
115 | #define CS4270_TRANS_INV_DAC_B 0x04 | ||
116 | #define CS4270_TRANS_DEEMPH 0x01 | ||
117 | #define CS4270_MUTE_AUTO 0x20 | ||
118 | #define CS4270_MUTE_ADC_A 0x08 | ||
119 | #define CS4270_MUTE_ADC_B 0x10 | ||
120 | #define CS4270_MUTE_POLARITY 0x04 | ||
121 | #define CS4270_MUTE_DAC_A 0x01 | ||
122 | #define CS4270_MUTE_DAC_B 0x02 | ||
123 | |||
124 | /* | ||
125 | * Clock Ratio Selection for Master Mode with I2C enabled | ||
126 | * | ||
127 | * The data for this chart is taken from Table 5 of the CS4270 reference | ||
128 | * manual. | ||
129 | * | ||
130 | * This table is used to determine how to program the Mode Control register. | ||
131 | * It is also used by cs4270_set_dai_sysclk() to tell ALSA which sampling | ||
132 | * rates the CS4270 currently supports. | ||
133 | * | ||
134 | * Each element in this array corresponds to the ratios in mclk_ratios[]. | ||
135 | * These two arrays need to be in sync. | ||
136 | * | ||
137 | * 'speed_mode' is the corresponding bit pattern to be written to the | ||
138 | * MODE bits of the Mode Control Register | ||
139 | * | ||
140 | * 'mclk' is the corresponding bit pattern to be wirten to the MCLK bits of | ||
141 | * the Mode Control Register. | ||
142 | * | ||
143 | * In situations where a single ratio is represented by multiple speed | ||
144 | * modes, we favor the slowest speed. E.g, for a ratio of 128, we pick | ||
145 | * double-speed instead of quad-speed. However, the CS4270 errata states | ||
146 | * that Divide-By-1.5 can cause failures, so we avoid that mode where | ||
147 | * possible. | ||
148 | * | ||
149 | * ERRATA: There is an errata for the CS4270 where divide-by-1.5 does not | ||
150 | * work if VD = 3.3V. If this effects you, select the | ||
151 | * CONFIG_SND_SOC_CS4270_VD33_ERRATA Kconfig option, and the driver will | ||
152 | * never select any sample rates that require divide-by-1.5. | ||
153 | */ | ||
154 | static struct { | ||
155 | unsigned int ratio; | ||
156 | u8 speed_mode; | ||
157 | u8 mclk; | ||
158 | } cs4270_mode_ratios[] = { | ||
159 | {64, CS4270_MODE_4X, CS4270_MODE_DIV1}, | ||
160 | #ifndef CONFIG_SND_SOC_CS4270_VD33_ERRATA | ||
161 | {96, CS4270_MODE_4X, CS4270_MODE_DIV15}, | ||
162 | #endif | ||
163 | {128, CS4270_MODE_2X, CS4270_MODE_DIV1}, | ||
164 | {192, CS4270_MODE_4X, CS4270_MODE_DIV3}, | ||
165 | {256, CS4270_MODE_1X, CS4270_MODE_DIV1}, | ||
166 | {384, CS4270_MODE_2X, CS4270_MODE_DIV3}, | ||
167 | {512, CS4270_MODE_1X, CS4270_MODE_DIV2}, | ||
168 | {768, CS4270_MODE_1X, CS4270_MODE_DIV3}, | ||
169 | {1024, CS4270_MODE_1X, CS4270_MODE_DIV4} | ||
170 | }; | ||
171 | |||
172 | /* The number of MCLK/LRCK ratios supported by the CS4270 */ | ||
173 | #define NUM_MCLK_RATIOS ARRAY_SIZE(cs4270_mode_ratios) | ||
57 | 174 | ||
58 | /* | 175 | /* |
59 | * Determine the CS4270 samples rates. | 176 | * Determine the CS4270 samples rates. |
@@ -97,7 +214,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, | |||
97 | cs4270->mclk = freq; | 214 | cs4270->mclk = freq; |
98 | 215 | ||
99 | for (i = 0; i < NUM_MCLK_RATIOS; i++) { | 216 | for (i = 0; i < NUM_MCLK_RATIOS; i++) { |
100 | unsigned int rate = freq / mclk_ratios[i]; | 217 | unsigned int rate = freq / cs4270_mode_ratios[i].ratio; |
101 | rates |= snd_pcm_rate_to_rate_bit(rate); | 218 | rates |= snd_pcm_rate_to_rate_bit(rate); |
102 | if (rate < rate_min) | 219 | if (rate < rate_min) |
103 | rate_min = rate; | 220 | rate_min = rate; |
@@ -155,80 +272,6 @@ static int cs4270_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, | |||
155 | } | 272 | } |
156 | 273 | ||
157 | /* | 274 | /* |
158 | * The codec isn't really big-endian or little-endian, since the I2S | ||
159 | * interface requires data to be sent serially with the MSbit first. | ||
160 | * However, to support BE and LE I2S devices, we specify both here. That | ||
161 | * way, ALSA will always match the bit patterns. | ||
162 | */ | ||
163 | #define CS4270_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ | ||
164 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | \ | ||
165 | SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE | \ | ||
166 | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE | \ | ||
167 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | \ | ||
168 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE) | ||
169 | |||
170 | #ifdef USE_I2C | ||
171 | |||
172 | /* CS4270 registers addresses */ | ||
173 | #define CS4270_CHIPID 0x01 /* Chip ID */ | ||
174 | #define CS4270_PWRCTL 0x02 /* Power Control */ | ||
175 | #define CS4270_MODE 0x03 /* Mode Control */ | ||
176 | #define CS4270_FORMAT 0x04 /* Serial Format, ADC/DAC Control */ | ||
177 | #define CS4270_TRANS 0x05 /* Transition Control */ | ||
178 | #define CS4270_MUTE 0x06 /* Mute Control */ | ||
179 | #define CS4270_VOLA 0x07 /* DAC Channel A Volume Control */ | ||
180 | #define CS4270_VOLB 0x08 /* DAC Channel B Volume Control */ | ||
181 | |||
182 | #define CS4270_FIRSTREG 0x01 | ||
183 | #define CS4270_LASTREG 0x08 | ||
184 | #define CS4270_NUMREGS (CS4270_LASTREG - CS4270_FIRSTREG + 1) | ||
185 | |||
186 | /* Bit masks for the CS4270 registers */ | ||
187 | #define CS4270_CHIPID_ID 0xF0 | ||
188 | #define CS4270_CHIPID_REV 0x0F | ||
189 | #define CS4270_PWRCTL_FREEZE 0x80 | ||
190 | #define CS4270_PWRCTL_PDN_ADC 0x20 | ||
191 | #define CS4270_PWRCTL_PDN_DAC 0x02 | ||
192 | #define CS4270_PWRCTL_PDN 0x01 | ||
193 | #define CS4270_MODE_SPEED_MASK 0x30 | ||
194 | #define CS4270_MODE_1X 0x00 | ||
195 | #define CS4270_MODE_2X 0x10 | ||
196 | #define CS4270_MODE_4X 0x20 | ||
197 | #define CS4270_MODE_SLAVE 0x30 | ||
198 | #define CS4270_MODE_DIV_MASK 0x0E | ||
199 | #define CS4270_MODE_DIV1 0x00 | ||
200 | #define CS4270_MODE_DIV15 0x02 | ||
201 | #define CS4270_MODE_DIV2 0x04 | ||
202 | #define CS4270_MODE_DIV3 0x06 | ||
203 | #define CS4270_MODE_DIV4 0x08 | ||
204 | #define CS4270_MODE_POPGUARD 0x01 | ||
205 | #define CS4270_FORMAT_FREEZE_A 0x80 | ||
206 | #define CS4270_FORMAT_FREEZE_B 0x40 | ||
207 | #define CS4270_FORMAT_LOOPBACK 0x20 | ||
208 | #define CS4270_FORMAT_DAC_MASK 0x18 | ||
209 | #define CS4270_FORMAT_DAC_LJ 0x00 | ||
210 | #define CS4270_FORMAT_DAC_I2S 0x08 | ||
211 | #define CS4270_FORMAT_DAC_RJ16 0x18 | ||
212 | #define CS4270_FORMAT_DAC_RJ24 0x10 | ||
213 | #define CS4270_FORMAT_ADC_MASK 0x01 | ||
214 | #define CS4270_FORMAT_ADC_LJ 0x00 | ||
215 | #define CS4270_FORMAT_ADC_I2S 0x01 | ||
216 | #define CS4270_TRANS_ONE_VOL 0x80 | ||
217 | #define CS4270_TRANS_SOFT 0x40 | ||
218 | #define CS4270_TRANS_ZERO 0x20 | ||
219 | #define CS4270_TRANS_INV_ADC_A 0x08 | ||
220 | #define CS4270_TRANS_INV_ADC_B 0x10 | ||
221 | #define CS4270_TRANS_INV_DAC_A 0x02 | ||
222 | #define CS4270_TRANS_INV_DAC_B 0x04 | ||
223 | #define CS4270_TRANS_DEEMPH 0x01 | ||
224 | #define CS4270_MUTE_AUTO 0x20 | ||
225 | #define CS4270_MUTE_ADC_A 0x08 | ||
226 | #define CS4270_MUTE_ADC_B 0x10 | ||
227 | #define CS4270_MUTE_POLARITY 0x04 | ||
228 | #define CS4270_MUTE_DAC_A 0x01 | ||
229 | #define CS4270_MUTE_DAC_B 0x02 | ||
230 | |||
231 | /* | ||
232 | * A list of addresses on which this CS4270 could use. I2C addresses are | 275 | * A list of addresses on which this CS4270 could use. I2C addresses are |
233 | * 7 bits. For the CS4270, the upper four bits are always 1001, and the | 276 | * 7 bits. For the CS4270, the upper four bits are always 1001, and the |
234 | * lower three bits are determined via the AD2, AD1, and AD0 pins | 277 | * lower three bits are determined via the AD2, AD1, and AD0 pins |
@@ -315,53 +358,6 @@ static int cs4270_i2c_write(struct snd_soc_codec *codec, unsigned int reg, | |||
315 | } | 358 | } |
316 | 359 | ||
317 | /* | 360 | /* |
318 | * Clock Ratio Selection for Master Mode with I2C enabled | ||
319 | * | ||
320 | * The data for this chart is taken from Table 5 of the CS4270 reference | ||
321 | * manual. | ||
322 | * | ||
323 | * This table is used to determine how to program the Mode Control register. | ||
324 | * It is also used by cs4270_set_dai_sysclk() to tell ALSA which sampling | ||
325 | * rates the CS4270 currently supports. | ||
326 | * | ||
327 | * Each element in this array corresponds to the ratios in mclk_ratios[]. | ||
328 | * These two arrays need to be in sync. | ||
329 | * | ||
330 | * 'speed_mode' is the corresponding bit pattern to be written to the | ||
331 | * MODE bits of the Mode Control Register | ||
332 | * | ||
333 | * 'mclk' is the corresponding bit pattern to be wirten to the MCLK bits of | ||
334 | * the Mode Control Register. | ||
335 | * | ||
336 | * In situations where a single ratio is represented by multiple speed | ||
337 | * modes, we favor the slowest speed. E.g, for a ratio of 128, we pick | ||
338 | * double-speed instead of quad-speed. However, the CS4270 errata states | ||
339 | * that Divide-By-1.5 can cause failures, so we avoid that mode where | ||
340 | * possible. | ||
341 | * | ||
342 | * ERRATA: There is an errata for the CS4270 where divide-by-1.5 does not | ||
343 | * work if VD = 3.3V. If this effects you, select the | ||
344 | * CONFIG_SND_SOC_CS4270_VD33_ERRATA Kconfig option, and the driver will | ||
345 | * never select any sample rates that require divide-by-1.5. | ||
346 | */ | ||
347 | static struct { | ||
348 | u8 speed_mode; | ||
349 | u8 mclk; | ||
350 | } cs4270_mode_ratios[NUM_MCLK_RATIOS] = { | ||
351 | {CS4270_MODE_4X, CS4270_MODE_DIV1}, /* 64 */ | ||
352 | #ifndef CONFIG_SND_SOC_CS4270_VD33_ERRATA | ||
353 | {CS4270_MODE_4X, CS4270_MODE_DIV15}, /* 96 */ | ||
354 | #endif | ||
355 | {CS4270_MODE_2X, CS4270_MODE_DIV1}, /* 128 */ | ||
356 | {CS4270_MODE_4X, CS4270_MODE_DIV3}, /* 192 */ | ||
357 | {CS4270_MODE_1X, CS4270_MODE_DIV1}, /* 256 */ | ||
358 | {CS4270_MODE_2X, CS4270_MODE_DIV3}, /* 384 */ | ||
359 | {CS4270_MODE_1X, CS4270_MODE_DIV2}, /* 512 */ | ||
360 | {CS4270_MODE_1X, CS4270_MODE_DIV3}, /* 768 */ | ||
361 | {CS4270_MODE_1X, CS4270_MODE_DIV4} /* 1024 */ | ||
362 | }; | ||
363 | |||
364 | /* | ||
365 | * Program the CS4270 with the given hardware parameters. | 361 | * Program the CS4270 with the given hardware parameters. |
366 | * | 362 | * |
367 | * The .dai_ops functions are used to provide board-specific data, like | 363 | * The .dai_ops functions are used to provide board-specific data, like |
@@ -388,7 +384,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, | |||
388 | ratio = cs4270->mclk / rate; /* MCLK/LRCK ratio */ | 384 | ratio = cs4270->mclk / rate; /* MCLK/LRCK ratio */ |
389 | 385 | ||
390 | for (i = 0; i < NUM_MCLK_RATIOS; i++) { | 386 | for (i = 0; i < NUM_MCLK_RATIOS; i++) { |
391 | if (mclk_ratios[i] == ratio) | 387 | if (cs4270_mode_ratios[i].ratio == ratio) |
392 | break; | 388 | break; |
393 | } | 389 | } |
394 | 390 | ||
@@ -669,7 +665,7 @@ error: | |||
669 | return ret; | 665 | return ret; |
670 | } | 666 | } |
671 | 667 | ||
672 | #endif | 668 | #endif /* USE_I2C*/ |
673 | 669 | ||
674 | struct snd_soc_codec_dai cs4270_dai = { | 670 | struct snd_soc_codec_dai cs4270_dai = { |
675 | .name = "CS4270", | 671 | .name = "CS4270", |
@@ -687,10 +683,6 @@ struct snd_soc_codec_dai cs4270_dai = { | |||
687 | .rates = 0, | 683 | .rates = 0, |
688 | .formats = CS4270_FORMATS, | 684 | .formats = CS4270_FORMATS, |
689 | }, | 685 | }, |
690 | .dai_ops = { | ||
691 | .set_sysclk = cs4270_set_dai_sysclk, | ||
692 | .set_fmt = cs4270_set_dai_fmt, | ||
693 | } | ||
694 | }; | 686 | }; |
695 | EXPORT_SYMBOL_GPL(cs4270_dai); | 687 | EXPORT_SYMBOL_GPL(cs4270_dai); |
696 | 688 | ||
@@ -752,6 +744,8 @@ static int cs4270_probe(struct platform_device *pdev) | |||
752 | if (codec->control_data) { | 744 | if (codec->control_data) { |
753 | /* Initialize codec ops */ | 745 | /* Initialize codec ops */ |
754 | cs4270_dai.ops.hw_params = cs4270_hw_params; | 746 | cs4270_dai.ops.hw_params = cs4270_hw_params; |
747 | cs4270_dai.dai_ops.set_sysclk = cs4270_set_dai_sysclk; | ||
748 | cs4270_dai.dai_ops.set_fmt = cs4270_set_dai_fmt; | ||
755 | #ifdef CONFIG_SND_SOC_CS4270_HWMUTE | 749 | #ifdef CONFIG_SND_SOC_CS4270_HWMUTE |
756 | cs4270_dai.dai_ops.digital_mute = cs4270_mute; | 750 | cs4270_dai.dai_ops.digital_mute = cs4270_mute; |
757 | #endif | 751 | #endif |
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c new file mode 100644 index 000000000000..710e0287ef8c --- /dev/null +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -0,0 +1,1274 @@ | |||
1 | /* | ||
2 | * ALSA SoC TLV320AIC3X codec driver | ||
3 | * | ||
4 | * Author: Vladimir Barinov, <vbarinov@ru.mvista.com> | ||
5 | * Copyright: (C) 2007 MontaVista Software, Inc., <source@mvista.com> | ||
6 | * | ||
7 | * Based on sound/soc/codecs/wm8753.c by Liam Girdwood | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * Notes: | ||
14 | * The AIC3X is a driver for a low power stereo audio | ||
15 | * codecs aic31, aic32, aic33. | ||
16 | * | ||
17 | * It supports full aic33 codec functionality. | ||
18 | * The compatibility with aic32, aic31 is as follows: | ||
19 | * aic32 | aic31 | ||
20 | * --------------------------------------- | ||
21 | * MONO_LOUT -> N/A | MONO_LOUT -> N/A | ||
22 | * | IN1L -> LINE1L | ||
23 | * | IN1R -> LINE1R | ||
24 | * | IN2L -> LINE2L | ||
25 | * | IN2R -> LINE2R | ||
26 | * | MIC3L/R -> N/A | ||
27 | * truncated internal functionality in | ||
28 | * accordance with documentation | ||
29 | * --------------------------------------- | ||
30 | * | ||
31 | * Hence the machine layer should disable unsupported inputs/outputs by | ||
32 | * snd_soc_dapm_set_endpoint(codec, "MONO_LOUT", 0), etc. | ||
33 | */ | ||
34 | |||
35 | #include <linux/module.h> | ||
36 | #include <linux/moduleparam.h> | ||
37 | #include <linux/init.h> | ||
38 | #include <linux/delay.h> | ||
39 | #include <linux/pm.h> | ||
40 | #include <linux/i2c.h> | ||
41 | #include <linux/platform_device.h> | ||
42 | #include <sound/core.h> | ||
43 | #include <sound/pcm.h> | ||
44 | #include <sound/pcm_params.h> | ||
45 | #include <sound/soc.h> | ||
46 | #include <sound/soc-dapm.h> | ||
47 | #include <sound/initval.h> | ||
48 | |||
49 | #include "tlv320aic3x.h" | ||
50 | |||
51 | #define AUDIO_NAME "aic3x" | ||
52 | #define AIC3X_VERSION "0.1" | ||
53 | |||
54 | /* codec private data */ | ||
55 | struct aic3x_priv { | ||
56 | unsigned int sysclk; | ||
57 | int master; | ||
58 | }; | ||
59 | |||
60 | /* | ||
61 | * AIC3X register cache | ||
62 | * We can't read the AIC3X register space when we are | ||
63 | * using 2 wire for device control, so we cache them instead. | ||
64 | * There is no point in caching the reset register | ||
65 | */ | ||
66 | static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { | ||
67 | 0x00, 0x00, 0x00, 0x10, /* 0 */ | ||
68 | 0x04, 0x00, 0x00, 0x00, /* 4 */ | ||
69 | 0x00, 0x00, 0x00, 0x01, /* 8 */ | ||
70 | 0x00, 0x00, 0x00, 0x80, /* 12 */ | ||
71 | 0x80, 0xff, 0xff, 0x78, /* 16 */ | ||
72 | 0x78, 0x78, 0x78, 0x78, /* 20 */ | ||
73 | 0x78, 0x00, 0x00, 0xfe, /* 24 */ | ||
74 | 0x00, 0x00, 0xfe, 0x00, /* 28 */ | ||
75 | 0x18, 0x18, 0x00, 0x00, /* 32 */ | ||
76 | 0x00, 0x00, 0x00, 0x00, /* 36 */ | ||
77 | 0x00, 0x00, 0x00, 0x80, /* 40 */ | ||
78 | 0x80, 0x00, 0x00, 0x00, /* 44 */ | ||
79 | 0x00, 0x00, 0x00, 0x04, /* 48 */ | ||
80 | 0x00, 0x00, 0x00, 0x00, /* 52 */ | ||
81 | 0x00, 0x00, 0x04, 0x00, /* 56 */ | ||
82 | 0x00, 0x00, 0x00, 0x00, /* 60 */ | ||
83 | 0x00, 0x04, 0x00, 0x00, /* 64 */ | ||
84 | 0x00, 0x00, 0x00, 0x00, /* 68 */ | ||
85 | 0x04, 0x00, 0x00, 0x00, /* 72 */ | ||
86 | 0x00, 0x00, 0x00, 0x00, /* 76 */ | ||
87 | 0x00, 0x00, 0x00, 0x00, /* 80 */ | ||
88 | 0x00, 0x00, 0x00, 0x00, /* 84 */ | ||
89 | 0x00, 0x00, 0x00, 0x00, /* 88 */ | ||
90 | 0x00, 0x00, 0x00, 0x00, /* 92 */ | ||
91 | 0x00, 0x00, 0x00, 0x00, /* 96 */ | ||
92 | 0x00, 0x00, 0x02, /* 100 */ | ||
93 | }; | ||
94 | |||
95 | /* | ||
96 | * read aic3x register cache | ||
97 | */ | ||
98 | static inline unsigned int aic3x_read_reg_cache(struct snd_soc_codec *codec, | ||
99 | unsigned int reg) | ||
100 | { | ||
101 | u8 *cache = codec->reg_cache; | ||
102 | if (reg >= AIC3X_CACHEREGNUM) | ||
103 | return -1; | ||
104 | return cache[reg]; | ||
105 | } | ||
106 | |||
107 | /* | ||
108 | * write aic3x register cache | ||
109 | */ | ||
110 | static inline void aic3x_write_reg_cache(struct snd_soc_codec *codec, | ||
111 | u8 reg, u8 value) | ||
112 | { | ||
113 | u8 *cache = codec->reg_cache; | ||
114 | if (reg >= AIC3X_CACHEREGNUM) | ||
115 | return; | ||
116 | cache[reg] = value; | ||
117 | } | ||
118 | |||
119 | /* | ||
120 | * write to the aic3x register space | ||
121 | */ | ||
122 | static int aic3x_write(struct snd_soc_codec *codec, unsigned int reg, | ||
123 | unsigned int value) | ||
124 | { | ||
125 | u8 data[2]; | ||
126 | |||
127 | /* data is | ||
128 | * D15..D8 aic3x register offset | ||
129 | * D7...D0 register data | ||
130 | */ | ||
131 | data[0] = reg & 0xff; | ||
132 | data[1] = value & 0xff; | ||
133 | |||
134 | aic3x_write_reg_cache(codec, data[0], data[1]); | ||
135 | if (codec->hw_write(codec->control_data, data, 2) == 2) | ||
136 | return 0; | ||
137 | else | ||
138 | return -EIO; | ||
139 | } | ||
140 | |||
141 | #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \ | ||
142 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | ||
143 | .info = snd_soc_info_volsw, \ | ||
144 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw_aic3x, \ | ||
145 | .private_value = SOC_SINGLE_VALUE(reg, shift, mask, invert) } | ||
146 | |||
147 | /* | ||
148 | * All input lines are connected when !0xf and disconnected with 0xf bit field, | ||
149 | * so we have to use specific dapm_put call for input mixer | ||
150 | */ | ||
151 | static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, | ||
152 | struct snd_ctl_elem_value *ucontrol) | ||
153 | { | ||
154 | struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); | ||
155 | int reg = kcontrol->private_value & 0xff; | ||
156 | int shift = (kcontrol->private_value >> 8) & 0x0f; | ||
157 | int mask = (kcontrol->private_value >> 16) & 0xff; | ||
158 | int invert = (kcontrol->private_value >> 24) & 0x01; | ||
159 | unsigned short val, val_mask; | ||
160 | int ret; | ||
161 | struct snd_soc_dapm_path *path; | ||
162 | int found = 0; | ||
163 | |||
164 | val = (ucontrol->value.integer.value[0] & mask); | ||
165 | |||
166 | mask = 0xf; | ||
167 | if (val) | ||
168 | val = mask; | ||
169 | |||
170 | if (invert) | ||
171 | val = mask - val; | ||
172 | val_mask = mask << shift; | ||
173 | val = val << shift; | ||
174 | |||
175 | mutex_lock(&widget->codec->mutex); | ||
176 | |||
177 | if (snd_soc_test_bits(widget->codec, reg, val_mask, val)) { | ||
178 | /* find dapm widget path assoc with kcontrol */ | ||
179 | list_for_each_entry(path, &widget->codec->dapm_paths, list) { | ||
180 | if (path->kcontrol != kcontrol) | ||
181 | continue; | ||
182 | |||
183 | /* found, now check type */ | ||
184 | found = 1; | ||
185 | if (val) | ||
186 | /* new connection */ | ||
187 | path->connect = invert ? 0 : 1; | ||
188 | else | ||
189 | /* old connection must be powered down */ | ||
190 | path->connect = invert ? 1 : 0; | ||
191 | break; | ||
192 | } | ||
193 | |||
194 | if (found) | ||
195 | snd_soc_dapm_sync_endpoints(widget->codec); | ||
196 | } | ||
197 | |||
198 | ret = snd_soc_update_bits(widget->codec, reg, val_mask, val); | ||
199 | |||
200 | mutex_unlock(&widget->codec->mutex); | ||
201 | return ret; | ||
202 | } | ||
203 | |||
204 | static const char *aic3x_left_dac_mux[] = { "DAC_L1", "DAC_L3", "DAC_L2" }; | ||
205 | static const char *aic3x_right_dac_mux[] = { "DAC_R1", "DAC_R3", "DAC_R2" }; | ||
206 | static const char *aic3x_left_hpcom_mux[] = | ||
207 | { "differential of HPLOUT", "constant VCM", "single-ended" }; | ||
208 | static const char *aic3x_right_hpcom_mux[] = | ||
209 | { "differential of HPROUT", "constant VCM", "single-ended", | ||
210 | "differential of HPLCOM", "external feedback" }; | ||
211 | static const char *aic3x_linein_mode_mux[] = { "single-ended", "differential" }; | ||
212 | |||
213 | #define LDAC_ENUM 0 | ||
214 | #define RDAC_ENUM 1 | ||
215 | #define LHPCOM_ENUM 2 | ||
216 | #define RHPCOM_ENUM 3 | ||
217 | #define LINE1L_ENUM 4 | ||
218 | #define LINE1R_ENUM 5 | ||
219 | #define LINE2L_ENUM 6 | ||
220 | #define LINE2R_ENUM 7 | ||
221 | |||
222 | static const struct soc_enum aic3x_enum[] = { | ||
223 | SOC_ENUM_SINGLE(DAC_LINE_MUX, 6, 3, aic3x_left_dac_mux), | ||
224 | SOC_ENUM_SINGLE(DAC_LINE_MUX, 4, 3, aic3x_right_dac_mux), | ||
225 | SOC_ENUM_SINGLE(HPLCOM_CFG, 4, 3, aic3x_left_hpcom_mux), | ||
226 | SOC_ENUM_SINGLE(HPRCOM_CFG, 3, 5, aic3x_right_hpcom_mux), | ||
227 | SOC_ENUM_SINGLE(LINE1L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux), | ||
228 | SOC_ENUM_SINGLE(LINE1R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux), | ||
229 | SOC_ENUM_SINGLE(LINE2L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux), | ||
230 | SOC_ENUM_SINGLE(LINE2R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux), | ||
231 | }; | ||
232 | |||
233 | static const struct snd_kcontrol_new aic3x_snd_controls[] = { | ||
234 | /* Output */ | ||
235 | SOC_DOUBLE_R("PCM Playback Volume", LDAC_VOL, RDAC_VOL, 0, 0x7f, 1), | ||
236 | |||
237 | SOC_DOUBLE_R("Line DAC Playback Volume", DACL1_2_LLOPM_VOL, | ||
238 | DACR1_2_RLOPM_VOL, 0, 0x7f, 1), | ||
239 | SOC_DOUBLE_R("Line DAC Playback Switch", LLOPM_CTRL, RLOPM_CTRL, 3, | ||
240 | 0x01, 0), | ||
241 | SOC_DOUBLE_R("Line PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL, | ||
242 | PGAR_2_RLOPM_VOL, 0, 0x7f, 1), | ||
243 | SOC_DOUBLE_R("Line Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL, | ||
244 | LINE2R_2_RLOPM_VOL, 0, 0x7f, 1), | ||
245 | |||
246 | SOC_DOUBLE_R("Mono DAC Playback Volume", DACL1_2_MONOLOPM_VOL, | ||
247 | DACR1_2_MONOLOPM_VOL, 0, 0x7f, 1), | ||
248 | SOC_SINGLE("Mono DAC Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0), | ||
249 | SOC_DOUBLE_R("Mono PGA Bypass Playback Volume", PGAL_2_MONOLOPM_VOL, | ||
250 | PGAR_2_MONOLOPM_VOL, 0, 0x7f, 1), | ||
251 | SOC_DOUBLE_R("Mono Line2 Bypass Playback Volume", LINE2L_2_MONOLOPM_VOL, | ||
252 | LINE2R_2_MONOLOPM_VOL, 0, 0x7f, 1), | ||
253 | |||
254 | SOC_DOUBLE_R("HP DAC Playback Volume", DACL1_2_HPLOUT_VOL, | ||
255 | DACR1_2_HPROUT_VOL, 0, 0x7f, 1), | ||
256 | SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3, | ||
257 | 0x01, 0), | ||
258 | SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_2_HPLOUT_VOL, | ||
259 | PGAR_2_HPROUT_VOL, 0, 0x7f, 1), | ||
260 | SOC_DOUBLE_R("HP Line2 Bypass Playback Volume", LINE2L_2_HPLOUT_VOL, | ||
261 | LINE2R_2_HPROUT_VOL, 0, 0x7f, 1), | ||
262 | |||
263 | SOC_DOUBLE_R("HPCOM DAC Playback Volume", DACL1_2_HPLCOM_VOL, | ||
264 | DACR1_2_HPRCOM_VOL, 0, 0x7f, 1), | ||
265 | SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3, | ||
266 | 0x01, 0), | ||
267 | SOC_DOUBLE_R("HPCOM PGA Bypass Playback Volume", PGAL_2_HPLCOM_VOL, | ||
268 | PGAR_2_HPRCOM_VOL, 0, 0x7f, 1), | ||
269 | SOC_DOUBLE_R("HPCOM Line2 Bypass Playback Volume", LINE2L_2_HPLCOM_VOL, | ||
270 | LINE2R_2_HPRCOM_VOL, 0, 0x7f, 1), | ||
271 | |||
272 | /* | ||
273 | * Note: enable Automatic input Gain Controller with care. It can | ||
274 | * adjust PGA to max value when ADC is on and will never go back. | ||
275 | */ | ||
276 | SOC_DOUBLE_R("AGC Switch", LAGC_CTRL_A, RAGC_CTRL_A, 7, 0x01, 0), | ||
277 | |||
278 | /* Input */ | ||
279 | SOC_DOUBLE_R("PGA Capture Volume", LADC_VOL, RADC_VOL, 0, 0x7f, 0), | ||
280 | SOC_DOUBLE_R("PGA Capture Switch", LADC_VOL, RADC_VOL, 7, 0x01, 1), | ||
281 | }; | ||
282 | |||
283 | /* add non dapm controls */ | ||
284 | static int aic3x_add_controls(struct snd_soc_codec *codec) | ||
285 | { | ||
286 | int err, i; | ||
287 | |||
288 | for (i = 0; i < ARRAY_SIZE(aic3x_snd_controls); i++) { | ||
289 | err = snd_ctl_add(codec->card, | ||
290 | snd_soc_cnew(&aic3x_snd_controls[i], | ||
291 | codec, NULL)); | ||
292 | if (err < 0) | ||
293 | return err; | ||
294 | } | ||
295 | |||
296 | return 0; | ||
297 | } | ||
298 | |||
299 | /* Left DAC Mux */ | ||
300 | static const struct snd_kcontrol_new aic3x_left_dac_mux_controls = | ||
301 | SOC_DAPM_ENUM("Route", aic3x_enum[LDAC_ENUM]); | ||
302 | |||
303 | /* Right DAC Mux */ | ||
304 | static const struct snd_kcontrol_new aic3x_right_dac_mux_controls = | ||
305 | SOC_DAPM_ENUM("Route", aic3x_enum[RDAC_ENUM]); | ||
306 | |||
307 | /* Left HPCOM Mux */ | ||
308 | static const struct snd_kcontrol_new aic3x_left_hpcom_mux_controls = | ||
309 | SOC_DAPM_ENUM("Route", aic3x_enum[LHPCOM_ENUM]); | ||
310 | |||
311 | /* Right HPCOM Mux */ | ||
312 | static const struct snd_kcontrol_new aic3x_right_hpcom_mux_controls = | ||
313 | SOC_DAPM_ENUM("Route", aic3x_enum[RHPCOM_ENUM]); | ||
314 | |||
315 | /* Left DAC_L1 Mixer */ | ||
316 | static const struct snd_kcontrol_new aic3x_left_dac_mixer_controls[] = { | ||
317 | SOC_DAPM_SINGLE("Line Switch", DACL1_2_LLOPM_VOL, 7, 1, 0), | ||
318 | SOC_DAPM_SINGLE("Mono Switch", DACL1_2_MONOLOPM_VOL, 7, 1, 0), | ||
319 | SOC_DAPM_SINGLE("HP Switch", DACL1_2_HPLOUT_VOL, 7, 1, 0), | ||
320 | SOC_DAPM_SINGLE("HPCOM Switch", DACL1_2_HPLCOM_VOL, 7, 1, 0), | ||
321 | }; | ||
322 | |||
323 | /* Right DAC_R1 Mixer */ | ||
324 | static const struct snd_kcontrol_new aic3x_right_dac_mixer_controls[] = { | ||
325 | SOC_DAPM_SINGLE("Line Switch", DACR1_2_RLOPM_VOL, 7, 1, 0), | ||
326 | SOC_DAPM_SINGLE("Mono Switch", DACR1_2_MONOLOPM_VOL, 7, 1, 0), | ||
327 | SOC_DAPM_SINGLE("HP Switch", DACR1_2_HPROUT_VOL, 7, 1, 0), | ||
328 | SOC_DAPM_SINGLE("HPCOM Switch", DACR1_2_HPRCOM_VOL, 7, 1, 0), | ||
329 | }; | ||
330 | |||
331 | /* Left PGA Mixer */ | ||
332 | static const struct snd_kcontrol_new aic3x_left_pga_mixer_controls[] = { | ||
333 | SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_LADC_CTRL, 3, 1, 1), | ||
334 | SOC_DAPM_SINGLE_AIC3X("Line2L Switch", LINE2L_2_LADC_CTRL, 3, 1, 1), | ||
335 | SOC_DAPM_SINGLE_AIC3X("Mic3L Switch", MIC3LR_2_LADC_CTRL, 4, 1, 1), | ||
336 | }; | ||
337 | |||
338 | /* Right PGA Mixer */ | ||
339 | static const struct snd_kcontrol_new aic3x_right_pga_mixer_controls[] = { | ||
340 | SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_RADC_CTRL, 3, 1, 1), | ||
341 | SOC_DAPM_SINGLE_AIC3X("Line2R Switch", LINE2R_2_RADC_CTRL, 3, 1, 1), | ||
342 | SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", MIC3LR_2_RADC_CTRL, 0, 1, 1), | ||
343 | }; | ||
344 | |||
345 | /* Left Line1 Mux */ | ||
346 | static const struct snd_kcontrol_new aic3x_left_line1_mux_controls = | ||
347 | SOC_DAPM_ENUM("Route", aic3x_enum[LINE1L_ENUM]); | ||
348 | |||
349 | /* Right Line1 Mux */ | ||
350 | static const struct snd_kcontrol_new aic3x_right_line1_mux_controls = | ||
351 | SOC_DAPM_ENUM("Route", aic3x_enum[LINE1R_ENUM]); | ||
352 | |||
353 | /* Left Line2 Mux */ | ||
354 | static const struct snd_kcontrol_new aic3x_left_line2_mux_controls = | ||
355 | SOC_DAPM_ENUM("Route", aic3x_enum[LINE2L_ENUM]); | ||
356 | |||
357 | /* Right Line2 Mux */ | ||
358 | static const struct snd_kcontrol_new aic3x_right_line2_mux_controls = | ||
359 | SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM]); | ||
360 | |||
361 | /* Left PGA Bypass Mixer */ | ||
362 | static const struct snd_kcontrol_new aic3x_left_pga_bp_mixer_controls[] = { | ||
363 | SOC_DAPM_SINGLE("Line Switch", PGAL_2_LLOPM_VOL, 7, 1, 0), | ||
364 | SOC_DAPM_SINGLE("Mono Switch", PGAL_2_MONOLOPM_VOL, 7, 1, 0), | ||
365 | SOC_DAPM_SINGLE("HP Switch", PGAL_2_HPLOUT_VOL, 7, 1, 0), | ||
366 | SOC_DAPM_SINGLE("HPCOM Switch", PGAL_2_HPLCOM_VOL, 7, 1, 0), | ||
367 | }; | ||
368 | |||
369 | /* Right PGA Bypass Mixer */ | ||
370 | static const struct snd_kcontrol_new aic3x_right_pga_bp_mixer_controls[] = { | ||
371 | SOC_DAPM_SINGLE("Line Switch", PGAR_2_RLOPM_VOL, 7, 1, 0), | ||
372 | SOC_DAPM_SINGLE("Mono Switch", PGAR_2_MONOLOPM_VOL, 7, 1, 0), | ||
373 | SOC_DAPM_SINGLE("HP Switch", PGAR_2_HPROUT_VOL, 7, 1, 0), | ||
374 | SOC_DAPM_SINGLE("HPCOM Switch", PGAR_2_HPRCOM_VOL, 7, 1, 0), | ||
375 | }; | ||
376 | |||
377 | /* Left Line2 Bypass Mixer */ | ||
378 | static const struct snd_kcontrol_new aic3x_left_line2_bp_mixer_controls[] = { | ||
379 | SOC_DAPM_SINGLE("Line Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0), | ||
380 | SOC_DAPM_SINGLE("Mono Switch", LINE2L_2_MONOLOPM_VOL, 7, 1, 0), | ||
381 | SOC_DAPM_SINGLE("HP Switch", LINE2L_2_HPLOUT_VOL, 7, 1, 0), | ||
382 | SOC_DAPM_SINGLE("HPCOM Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0), | ||
383 | }; | ||
384 | |||
385 | /* Right Line2 Bypass Mixer */ | ||
386 | static const struct snd_kcontrol_new aic3x_right_line2_bp_mixer_controls[] = { | ||
387 | SOC_DAPM_SINGLE("Line Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0), | ||
388 | SOC_DAPM_SINGLE("Mono Switch", LINE2R_2_MONOLOPM_VOL, 7, 1, 0), | ||
389 | SOC_DAPM_SINGLE("HP Switch", LINE2R_2_HPROUT_VOL, 7, 1, 0), | ||
390 | SOC_DAPM_SINGLE("HPCOM Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0), | ||
391 | }; | ||
392 | |||
393 | static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { | ||
394 | /* Left DAC to Left Outputs */ | ||
395 | SND_SOC_DAPM_DAC("Left DAC", "Left Playback", DAC_PWR, 7, 0), | ||
396 | SND_SOC_DAPM_MUX("Left DAC Mux", SND_SOC_NOPM, 0, 0, | ||
397 | &aic3x_left_dac_mux_controls), | ||
398 | SND_SOC_DAPM_MIXER("Left DAC_L1 Mixer", SND_SOC_NOPM, 0, 0, | ||
399 | &aic3x_left_dac_mixer_controls[0], | ||
400 | ARRAY_SIZE(aic3x_left_dac_mixer_controls)), | ||
401 | SND_SOC_DAPM_MUX("Left HPCOM Mux", SND_SOC_NOPM, 0, 0, | ||
402 | &aic3x_left_hpcom_mux_controls), | ||
403 | SND_SOC_DAPM_PGA("Left Line Out", LLOPM_CTRL, 0, 0, NULL, 0), | ||
404 | SND_SOC_DAPM_PGA("Left HP Out", HPLOUT_CTRL, 0, 0, NULL, 0), | ||
405 | SND_SOC_DAPM_PGA("Left HP Com", HPLCOM_CTRL, 0, 0, NULL, 0), | ||
406 | |||
407 | /* Right DAC to Right Outputs */ | ||
408 | SND_SOC_DAPM_DAC("Right DAC", "Right Playback", DAC_PWR, 6, 0), | ||
409 | SND_SOC_DAPM_MUX("Right DAC Mux", SND_SOC_NOPM, 0, 0, | ||
410 | &aic3x_right_dac_mux_controls), | ||
411 | SND_SOC_DAPM_MIXER("Right DAC_R1 Mixer", SND_SOC_NOPM, 0, 0, | ||
412 | &aic3x_right_dac_mixer_controls[0], | ||
413 | ARRAY_SIZE(aic3x_right_dac_mixer_controls)), | ||
414 | SND_SOC_DAPM_MUX("Right HPCOM Mux", SND_SOC_NOPM, 0, 0, | ||
415 | &aic3x_right_hpcom_mux_controls), | ||
416 | SND_SOC_DAPM_PGA("Right Line Out", RLOPM_CTRL, 0, 0, NULL, 0), | ||
417 | SND_SOC_DAPM_PGA("Right HP Out", HPROUT_CTRL, 0, 0, NULL, 0), | ||
418 | SND_SOC_DAPM_PGA("Right HP Com", HPRCOM_CTRL, 0, 0, NULL, 0), | ||
419 | |||
420 | /* Mono Output */ | ||
421 | SND_SOC_DAPM_PGA("Mono Out", MONOLOPM_CTRL, 0, 0, NULL, 0), | ||
422 | |||
423 | /* Left Inputs to Left ADC */ | ||
424 | SND_SOC_DAPM_ADC("Left ADC", "Left Capture", LINE1L_2_LADC_CTRL, 2, 0), | ||
425 | SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0, | ||
426 | &aic3x_left_pga_mixer_controls[0], | ||
427 | ARRAY_SIZE(aic3x_left_pga_mixer_controls)), | ||
428 | SND_SOC_DAPM_MUX("Left Line1L Mux", SND_SOC_NOPM, 0, 0, | ||
429 | &aic3x_left_line1_mux_controls), | ||
430 | SND_SOC_DAPM_MUX("Left Line2L Mux", SND_SOC_NOPM, 0, 0, | ||
431 | &aic3x_left_line2_mux_controls), | ||
432 | |||
433 | /* Right Inputs to Right ADC */ | ||
434 | SND_SOC_DAPM_ADC("Right ADC", "Right Capture", | ||
435 | LINE1R_2_RADC_CTRL, 2, 0), | ||
436 | SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0, | ||
437 | &aic3x_right_pga_mixer_controls[0], | ||
438 | ARRAY_SIZE(aic3x_right_pga_mixer_controls)), | ||
439 | SND_SOC_DAPM_MUX("Right Line1R Mux", SND_SOC_NOPM, 0, 0, | ||
440 | &aic3x_right_line1_mux_controls), | ||
441 | SND_SOC_DAPM_MUX("Right Line2R Mux", SND_SOC_NOPM, 0, 0, | ||
442 | &aic3x_right_line2_mux_controls), | ||
443 | |||
444 | /* Mic Bias */ | ||
445 | SND_SOC_DAPM_MICBIAS("Mic Bias 2V", MICBIAS_CTRL, 6, 0), | ||
446 | SND_SOC_DAPM_MICBIAS("Mic Bias 2.5V", MICBIAS_CTRL, 7, 0), | ||
447 | SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 6, 0), | ||
448 | SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 7, 0), | ||
449 | |||
450 | /* Left PGA to Left Output bypass */ | ||
451 | SND_SOC_DAPM_MIXER("Left PGA Bypass Mixer", SND_SOC_NOPM, 0, 0, | ||
452 | &aic3x_left_pga_bp_mixer_controls[0], | ||
453 | ARRAY_SIZE(aic3x_left_pga_bp_mixer_controls)), | ||
454 | |||
455 | /* Right PGA to Right Output bypass */ | ||
456 | SND_SOC_DAPM_MIXER("Right PGA Bypass Mixer", SND_SOC_NOPM, 0, 0, | ||
457 | &aic3x_right_pga_bp_mixer_controls[0], | ||
458 | ARRAY_SIZE(aic3x_right_pga_bp_mixer_controls)), | ||
459 | |||
460 | /* Left Line2 to Left Output bypass */ | ||
461 | SND_SOC_DAPM_MIXER("Left Line2 Bypass Mixer", SND_SOC_NOPM, 0, 0, | ||
462 | &aic3x_left_line2_bp_mixer_controls[0], | ||
463 | ARRAY_SIZE(aic3x_left_line2_bp_mixer_controls)), | ||
464 | |||
465 | /* Right Line2 to Right Output bypass */ | ||
466 | SND_SOC_DAPM_MIXER("Right Line2 Bypass Mixer", SND_SOC_NOPM, 0, 0, | ||
467 | &aic3x_right_line2_bp_mixer_controls[0], | ||
468 | ARRAY_SIZE(aic3x_right_line2_bp_mixer_controls)), | ||
469 | |||
470 | SND_SOC_DAPM_OUTPUT("LLOUT"), | ||
471 | SND_SOC_DAPM_OUTPUT("RLOUT"), | ||
472 | SND_SOC_DAPM_OUTPUT("MONO_LOUT"), | ||
473 | SND_SOC_DAPM_OUTPUT("HPLOUT"), | ||
474 | SND_SOC_DAPM_OUTPUT("HPROUT"), | ||
475 | SND_SOC_DAPM_OUTPUT("HPLCOM"), | ||
476 | SND_SOC_DAPM_OUTPUT("HPRCOM"), | ||
477 | |||
478 | SND_SOC_DAPM_INPUT("MIC3L"), | ||
479 | SND_SOC_DAPM_INPUT("MIC3R"), | ||
480 | SND_SOC_DAPM_INPUT("LINE1L"), | ||
481 | SND_SOC_DAPM_INPUT("LINE1R"), | ||
482 | SND_SOC_DAPM_INPUT("LINE2L"), | ||
483 | SND_SOC_DAPM_INPUT("LINE2R"), | ||
484 | }; | ||
485 | |||
486 | static const char *intercon[][3] = { | ||
487 | /* Left Output */ | ||
488 | {"Left DAC Mux", "DAC_L1", "Left DAC"}, | ||
489 | {"Left DAC Mux", "DAC_L2", "Left DAC"}, | ||
490 | {"Left DAC Mux", "DAC_L3", "Left DAC"}, | ||
491 | |||
492 | {"Left DAC_L1 Mixer", "Line Switch", "Left DAC Mux"}, | ||
493 | {"Left DAC_L1 Mixer", "Mono Switch", "Left DAC Mux"}, | ||
494 | {"Left DAC_L1 Mixer", "HP Switch", "Left DAC Mux"}, | ||
495 | {"Left DAC_L1 Mixer", "HPCOM Switch", "Left DAC Mux"}, | ||
496 | {"Left Line Out", NULL, "Left DAC Mux"}, | ||
497 | {"Left HP Out", NULL, "Left DAC Mux"}, | ||
498 | |||
499 | {"Left HPCOM Mux", "differential of HPLOUT", "Left DAC_L1 Mixer"}, | ||
500 | {"Left HPCOM Mux", "constant VCM", "Left DAC_L1 Mixer"}, | ||
501 | {"Left HPCOM Mux", "single-ended", "Left DAC_L1 Mixer"}, | ||
502 | |||
503 | {"Left Line Out", NULL, "Left DAC_L1 Mixer"}, | ||
504 | {"Mono Out", NULL, "Left DAC_L1 Mixer"}, | ||
505 | {"Left HP Out", NULL, "Left DAC_L1 Mixer"}, | ||
506 | {"Left HP Com", NULL, "Left HPCOM Mux"}, | ||
507 | |||
508 | {"LLOUT", NULL, "Left Line Out"}, | ||
509 | {"LLOUT", NULL, "Left Line Out"}, | ||
510 | {"HPLOUT", NULL, "Left HP Out"}, | ||
511 | {"HPLCOM", NULL, "Left HP Com"}, | ||
512 | |||
513 | /* Right Output */ | ||
514 | {"Right DAC Mux", "DAC_R1", "Right DAC"}, | ||
515 | {"Right DAC Mux", "DAC_R2", "Right DAC"}, | ||
516 | {"Right DAC Mux", "DAC_R3", "Right DAC"}, | ||
517 | |||
518 | {"Right DAC_R1 Mixer", "Line Switch", "Right DAC Mux"}, | ||
519 | {"Right DAC_R1 Mixer", "Mono Switch", "Right DAC Mux"}, | ||
520 | {"Right DAC_R1 Mixer", "HP Switch", "Right DAC Mux"}, | ||
521 | {"Right DAC_R1 Mixer", "HPCOM Switch", "Right DAC Mux"}, | ||
522 | {"Right Line Out", NULL, "Right DAC Mux"}, | ||
523 | {"Right HP Out", NULL, "Right DAC Mux"}, | ||
524 | |||
525 | {"Right HPCOM Mux", "differential of HPROUT", "Right DAC_R1 Mixer"}, | ||
526 | {"Right HPCOM Mux", "constant VCM", "Right DAC_R1 Mixer"}, | ||
527 | {"Right HPCOM Mux", "single-ended", "Right DAC_R1 Mixer"}, | ||
528 | {"Right HPCOM Mux", "differential of HPLCOM", "Right DAC_R1 Mixer"}, | ||
529 | {"Right HPCOM Mux", "external feedback", "Right DAC_R1 Mixer"}, | ||
530 | |||
531 | {"Right Line Out", NULL, "Right DAC_R1 Mixer"}, | ||
532 | {"Mono Out", NULL, "Right DAC_R1 Mixer"}, | ||
533 | {"Right HP Out", NULL, "Right DAC_R1 Mixer"}, | ||
534 | {"Right HP Com", NULL, "Right HPCOM Mux"}, | ||
535 | |||
536 | {"RLOUT", NULL, "Right Line Out"}, | ||
537 | {"RLOUT", NULL, "Right Line Out"}, | ||
538 | {"HPROUT", NULL, "Right HP Out"}, | ||
539 | {"HPRCOM", NULL, "Right HP Com"}, | ||
540 | |||
541 | /* Mono Output */ | ||
542 | {"MONOLOUT", NULL, "Mono Out"}, | ||
543 | {"MONOLOUT", NULL, "Mono Out"}, | ||
544 | |||
545 | /* Left Input */ | ||
546 | {"Left Line1L Mux", "single-ended", "LINE1L"}, | ||
547 | {"Left Line1L Mux", "differential", "LINE1L"}, | ||
548 | |||
549 | {"Left Line2L Mux", "single-ended", "LINE2L"}, | ||
550 | {"Left Line2L Mux", "differential", "LINE2L"}, | ||
551 | |||
552 | {"Left PGA Mixer", "Line1L Switch", "Left Line1L Mux"}, | ||
553 | {"Left PGA Mixer", "Line2L Switch", "Left Line2L Mux"}, | ||
554 | {"Left PGA Mixer", "Mic3L Switch", "MIC3L"}, | ||
555 | |||
556 | {"Left ADC", NULL, "Left PGA Mixer"}, | ||
557 | |||
558 | /* Right Input */ | ||
559 | {"Right Line1R Mux", "single-ended", "LINE1R"}, | ||
560 | {"Right Line1R Mux", "differential", "LINE1R"}, | ||
561 | |||
562 | {"Right Line2R Mux", "single-ended", "LINE2R"}, | ||
563 | {"Right Line2R Mux", "differential", "LINE2R"}, | ||
564 | |||
565 | {"Right PGA Mixer", "Line1R Switch", "Right Line1R Mux"}, | ||
566 | {"Right PGA Mixer", "Line2R Switch", "Right Line2R Mux"}, | ||
567 | {"Right PGA Mixer", "Mic3R Switch", "MIC3R"}, | ||
568 | |||
569 | {"Right ADC", NULL, "Right PGA Mixer"}, | ||
570 | |||
571 | /* Left PGA Bypass */ | ||
572 | {"Left PGA Bypass Mixer", "Line Switch", "Left PGA Mixer"}, | ||
573 | {"Left PGA Bypass Mixer", "Mono Switch", "Left PGA Mixer"}, | ||
574 | {"Left PGA Bypass Mixer", "HP Switch", "Left PGA Mixer"}, | ||
575 | {"Left PGA Bypass Mixer", "HPCOM Switch", "Left PGA Mixer"}, | ||
576 | |||
577 | {"Left HPCOM Mux", "differential of HPLOUT", "Left PGA Bypass Mixer"}, | ||
578 | {"Left HPCOM Mux", "constant VCM", "Left PGA Bypass Mixer"}, | ||
579 | {"Left HPCOM Mux", "single-ended", "Left PGA Bypass Mixer"}, | ||
580 | |||
581 | {"Left Line Out", NULL, "Left PGA Bypass Mixer"}, | ||
582 | {"Mono Out", NULL, "Left PGA Bypass Mixer"}, | ||
583 | {"Left HP Out", NULL, "Left PGA Bypass Mixer"}, | ||
584 | |||
585 | /* Right PGA Bypass */ | ||
586 | {"Right PGA Bypass Mixer", "Line Switch", "Right PGA Mixer"}, | ||
587 | {"Right PGA Bypass Mixer", "Mono Switch", "Right PGA Mixer"}, | ||
588 | {"Right PGA Bypass Mixer", "HP Switch", "Right PGA Mixer"}, | ||
589 | {"Right PGA Bypass Mixer", "HPCOM Switch", "Right PGA Mixer"}, | ||
590 | |||
591 | {"Right HPCOM Mux", "differential of HPROUT", "Right PGA Bypass Mixer"}, | ||
592 | {"Right HPCOM Mux", "constant VCM", "Right PGA Bypass Mixer"}, | ||
593 | {"Right HPCOM Mux", "single-ended", "Right PGA Bypass Mixer"}, | ||
594 | {"Right HPCOM Mux", "differential of HPLCOM", "Right PGA Bypass Mixer"}, | ||
595 | {"Right HPCOM Mux", "external feedback", "Right PGA Bypass Mixer"}, | ||
596 | |||
597 | {"Right Line Out", NULL, "Right PGA Bypass Mixer"}, | ||
598 | {"Mono Out", NULL, "Right PGA Bypass Mixer"}, | ||
599 | {"Right HP Out", NULL, "Right PGA Bypass Mixer"}, | ||
600 | |||
601 | /* Left Line2 Bypass */ | ||
602 | {"Left Line2 Bypass Mixer", "Line Switch", "Left Line2L Mux"}, | ||
603 | {"Left Line2 Bypass Mixer", "Mono Switch", "Left Line2L Mux"}, | ||
604 | {"Left Line2 Bypass Mixer", "HP Switch", "Left Line2L Mux"}, | ||
605 | {"Left Line2 Bypass Mixer", "HPCOM Switch", "Left Line2L Mux"}, | ||
606 | |||
607 | {"Left HPCOM Mux", "differential of HPLOUT", "Left Line2 Bypass Mixer"}, | ||
608 | {"Left HPCOM Mux", "constant VCM", "Left Line2 Bypass Mixer"}, | ||
609 | {"Left HPCOM Mux", "single-ended", "Left Line2 Bypass Mixer"}, | ||
610 | |||
611 | {"Left Line Out", NULL, "Left Line2 Bypass Mixer"}, | ||
612 | {"Mono Out", NULL, "Left Line2 Bypass Mixer"}, | ||
613 | {"Left HP Out", NULL, "Left Line2 Bypass Mixer"}, | ||
614 | |||
615 | /* Right Line2 Bypass */ | ||
616 | {"Right Line2 Bypass Mixer", "Line Switch", "Right Line2R Mux"}, | ||
617 | {"Right Line2 Bypass Mixer", "Mono Switch", "Right Line2R Mux"}, | ||
618 | {"Right Line2 Bypass Mixer", "HP Switch", "Right Line2R Mux"}, | ||
619 | {"Right Line2 Bypass Mixer", "HPCOM Switch", "Right Line2R Mux"}, | ||
620 | |||
621 | {"Right HPCOM Mux", "differential of HPROUT", "Right Line2 Bypass Mixer"}, | ||
622 | {"Right HPCOM Mux", "constant VCM", "Right Line2 Bypass Mixer"}, | ||
623 | {"Right HPCOM Mux", "single-ended", "Right Line2 Bypass Mixer"}, | ||
624 | {"Right HPCOM Mux", "differential of HPLCOM", "Right Line2 Bypass Mixer"}, | ||
625 | {"Right HPCOM Mux", "external feedback", "Right Line2 Bypass Mixer"}, | ||
626 | |||
627 | {"Right Line Out", NULL, "Right Line2 Bypass Mixer"}, | ||
628 | {"Mono Out", NULL, "Right Line2 Bypass Mixer"}, | ||
629 | {"Right HP Out", NULL, "Right Line2 Bypass Mixer"}, | ||
630 | |||
631 | /* terminator */ | ||
632 | {NULL, NULL, NULL}, | ||
633 | }; | ||
634 | |||
635 | static int aic3x_add_widgets(struct snd_soc_codec *codec) | ||
636 | { | ||
637 | int i; | ||
638 | |||
639 | for (i = 0; i < ARRAY_SIZE(aic3x_dapm_widgets); i++) | ||
640 | snd_soc_dapm_new_control(codec, &aic3x_dapm_widgets[i]); | ||
641 | |||
642 | /* set up audio path interconnects */ | ||
643 | for (i = 0; intercon[i][0] != NULL; i++) | ||
644 | snd_soc_dapm_connect_input(codec, intercon[i][0], | ||
645 | intercon[i][1], intercon[i][2]); | ||
646 | |||
647 | snd_soc_dapm_new_widgets(codec); | ||
648 | return 0; | ||
649 | } | ||
650 | |||
651 | struct aic3x_rate_divs { | ||
652 | u32 mclk; | ||
653 | u32 rate; | ||
654 | u32 fsref_reg; | ||
655 | u8 sr_reg:4; | ||
656 | u8 pllj_reg; | ||
657 | u16 plld_reg; | ||
658 | }; | ||
659 | |||
660 | /* AIC3X codec mclk clock divider coefficients */ | ||
661 | static const struct aic3x_rate_divs aic3x_divs[] = { | ||
662 | /* 8k */ | ||
663 | {22579200, 8000, 48000, 0xa, 8, 7075}, | ||
664 | {33868800, 8000, 48000, 0xa, 5, 8049}, | ||
665 | /* 11.025k */ | ||
666 | {22579200, 11025, 44100, 0x6, 8, 0}, | ||
667 | {33868800, 11025, 44100, 0x6, 5, 3333}, | ||
668 | /* 16k */ | ||
669 | {22579200, 16000, 48000, 0x4, 8, 7075}, | ||
670 | {33868800, 16000, 48000, 0x4, 5, 8049}, | ||
671 | /* 22.05k */ | ||
672 | {22579200, 22050, 44100, 0x2, 8, 0}, | ||
673 | {33868800, 22050, 44100, 0x2, 5, 3333}, | ||
674 | /* 32k */ | ||
675 | {22579200, 32000, 48000, 0x1, 8, 7075}, | ||
676 | {33868800, 32000, 48000, 0x1, 5, 8049}, | ||
677 | /* 44.1k */ | ||
678 | {22579200, 44100, 44100, 0x0, 8, 0}, | ||
679 | {33868800, 44100, 44100, 0x0, 5, 3333}, | ||
680 | /* 48k */ | ||
681 | {22579200, 48000, 48000, 0x0, 8, 7075}, | ||
682 | {33868800, 48000, 48000, 0x0, 5, 8049}, | ||
683 | /* 64k */ | ||
684 | {22579200, 96000, 96000, 0x1, 8, 7075}, | ||
685 | {33868800, 96000, 96000, 0x1, 5, 8049}, | ||
686 | /* 88.2k */ | ||
687 | {22579200, 88200, 88200, 0x0, 8, 0}, | ||
688 | {33868800, 88200, 88200, 0x0, 5, 3333}, | ||
689 | /* 96k */ | ||
690 | {22579200, 96000, 96000, 0x0, 8, 7075}, | ||
691 | {33868800, 96000, 96000, 0x0, 5, 8049}, | ||
692 | }; | ||
693 | |||
694 | static inline int aic3x_get_divs(int mclk, int rate) | ||
695 | { | ||
696 | int i; | ||
697 | |||
698 | for (i = 0; i < ARRAY_SIZE(aic3x_divs); i++) { | ||
699 | if (aic3x_divs[i].rate == rate && aic3x_divs[i].mclk == mclk) | ||
700 | return i; | ||
701 | } | ||
702 | |||
703 | return 0; | ||
704 | } | ||
705 | |||
706 | static int aic3x_hw_params(struct snd_pcm_substream *substream, | ||
707 | struct snd_pcm_hw_params *params) | ||
708 | { | ||
709 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
710 | struct snd_soc_device *socdev = rtd->socdev; | ||
711 | struct snd_soc_codec *codec = socdev->codec; | ||
712 | struct aic3x_priv *aic3x = codec->private_data; | ||
713 | int i; | ||
714 | u8 data, pll_p, pll_r, pll_j; | ||
715 | u16 pll_d; | ||
716 | |||
717 | i = aic3x_get_divs(aic3x->sysclk, params_rate(params)); | ||
718 | |||
719 | /* Route Left DAC to left channel input and | ||
720 | * right DAC to right channel input */ | ||
721 | data = (LDAC2LCH | RDAC2RCH); | ||
722 | switch (aic3x_divs[i].fsref_reg) { | ||
723 | case 44100: | ||
724 | data |= FSREF_44100; | ||
725 | break; | ||
726 | case 48000: | ||
727 | data |= FSREF_48000; | ||
728 | break; | ||
729 | case 88200: | ||
730 | data |= FSREF_44100 | DUAL_RATE_MODE; | ||
731 | break; | ||
732 | case 96000: | ||
733 | data |= FSREF_48000 | DUAL_RATE_MODE; | ||
734 | break; | ||
735 | } | ||
736 | aic3x_write(codec, AIC3X_CODEC_DATAPATH_REG, data); | ||
737 | |||
738 | /* codec sample rate select */ | ||
739 | data = aic3x_divs[i].sr_reg; | ||
740 | data |= (data << 4); | ||
741 | aic3x_write(codec, AIC3X_SAMPLE_RATE_SEL_REG, data); | ||
742 | |||
743 | /* Use PLL for generation Fsref by equation: | ||
744 | * Fsref = (MCLK * K * R)/(2048 * P); | ||
745 | * Fix P = 2 and R = 1 and calculate K, if | ||
746 | * K = J.D, i.e. J - an interger portion of K and D is the fractional | ||
747 | * one with 4 digits of precision; | ||
748 | * Example: | ||
749 | * For MCLK = 22.5792 MHz and Fsref = 48kHz: | ||
750 | * Select P = 2, R= 1, K = 8.7074, which results in J = 8, D = 7074 | ||
751 | */ | ||
752 | pll_p = 2; | ||
753 | pll_r = 1; | ||
754 | pll_j = aic3x_divs[i].pllj_reg; | ||
755 | pll_d = aic3x_divs[i].plld_reg; | ||
756 | |||
757 | data = aic3x_read_reg_cache(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_AND_PLLR_REG, pll_r << PLLR_SHIFT); | ||
760 | aic3x_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); | ||
761 | aic3x_write(codec, AIC3X_PLL_PROGC_REG, (pll_d >> 6) << PLLD_MSB_SHIFT); | ||
762 | aic3x_write(codec, AIC3X_PLL_PROGD_REG, | ||
763 | (pll_d & 0x3F) << PLLD_LSB_SHIFT); | ||
764 | |||
765 | /* select data word length */ | ||
766 | data = | ||
767 | aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & (~(0x3 << 4)); | ||
768 | switch (params_format(params)) { | ||
769 | case SNDRV_PCM_FORMAT_S16_LE: | ||
770 | break; | ||
771 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
772 | data |= (0x01 << 4); | ||
773 | break; | ||
774 | case SNDRV_PCM_FORMAT_S24_LE: | ||
775 | data |= (0x02 << 4); | ||
776 | break; | ||
777 | case SNDRV_PCM_FORMAT_S32_LE: | ||
778 | data |= (0x03 << 4); | ||
779 | break; | ||
780 | } | ||
781 | aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, data); | ||
782 | |||
783 | return 0; | ||
784 | } | ||
785 | |||
786 | static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute) | ||
787 | { | ||
788 | struct snd_soc_codec *codec = dai->codec; | ||
789 | u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON; | ||
790 | u8 rdac_reg = aic3x_read_reg_cache(codec, RDAC_VOL) & ~MUTE_ON; | ||
791 | |||
792 | if (mute) { | ||
793 | aic3x_write(codec, LDAC_VOL, ldac_reg | MUTE_ON); | ||
794 | aic3x_write(codec, RDAC_VOL, rdac_reg | MUTE_ON); | ||
795 | } else { | ||
796 | aic3x_write(codec, LDAC_VOL, ldac_reg); | ||
797 | aic3x_write(codec, RDAC_VOL, rdac_reg); | ||
798 | } | ||
799 | |||
800 | return 0; | ||
801 | } | ||
802 | |||
803 | static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, | ||
804 | int clk_id, unsigned int freq, int dir) | ||
805 | { | ||
806 | struct snd_soc_codec *codec = codec_dai->codec; | ||
807 | struct aic3x_priv *aic3x = codec->private_data; | ||
808 | |||
809 | switch (freq) { | ||
810 | case 22579200: | ||
811 | case 33868800: | ||
812 | aic3x->sysclk = freq; | ||
813 | return 0; | ||
814 | } | ||
815 | |||
816 | return -EINVAL; | ||
817 | } | ||
818 | |||
819 | static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, | ||
820 | unsigned int fmt) | ||
821 | { | ||
822 | struct snd_soc_codec *codec = codec_dai->codec; | ||
823 | struct aic3x_priv *aic3x = codec->private_data; | ||
824 | u8 iface_areg = 0; | ||
825 | u8 iface_breg = 0; | ||
826 | |||
827 | /* set master/slave audio interface */ | ||
828 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
829 | case SND_SOC_DAIFMT_CBM_CFM: | ||
830 | aic3x->master = 1; | ||
831 | iface_areg |= BIT_CLK_MASTER | WORD_CLK_MASTER; | ||
832 | break; | ||
833 | case SND_SOC_DAIFMT_CBS_CFS: | ||
834 | aic3x->master = 0; | ||
835 | break; | ||
836 | default: | ||
837 | return -EINVAL; | ||
838 | } | ||
839 | |||
840 | /* interface format */ | ||
841 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
842 | case SND_SOC_DAIFMT_I2S: | ||
843 | break; | ||
844 | case SND_SOC_DAIFMT_DSP_A: | ||
845 | iface_breg |= (0x01 << 6); | ||
846 | break; | ||
847 | case SND_SOC_DAIFMT_RIGHT_J: | ||
848 | iface_breg |= (0x02 << 6); | ||
849 | break; | ||
850 | case SND_SOC_DAIFMT_LEFT_J: | ||
851 | iface_breg |= (0x03 << 6); | ||
852 | break; | ||
853 | default: | ||
854 | return -EINVAL; | ||
855 | } | ||
856 | |||
857 | /* set iface */ | ||
858 | aic3x_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg); | ||
859 | aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg); | ||
860 | |||
861 | return 0; | ||
862 | } | ||
863 | |||
864 | static int aic3x_dapm_event(struct snd_soc_codec *codec, int event) | ||
865 | { | ||
866 | struct aic3x_priv *aic3x = codec->private_data; | ||
867 | u8 reg; | ||
868 | |||
869 | switch (event) { | ||
870 | case SNDRV_CTL_POWER_D0: | ||
871 | /* all power is driven by DAPM system */ | ||
872 | if (aic3x->master) { | ||
873 | /* enable pll */ | ||
874 | reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); | ||
875 | aic3x_write(codec, AIC3X_PLL_PROGA_REG, | ||
876 | reg | PLL_ENABLE); | ||
877 | } | ||
878 | break; | ||
879 | case SNDRV_CTL_POWER_D1: | ||
880 | case SNDRV_CTL_POWER_D2: | ||
881 | break; | ||
882 | case SNDRV_CTL_POWER_D3hot: | ||
883 | /* | ||
884 | * all power is driven by DAPM system, | ||
885 | * so output power is safe if bypass was set | ||
886 | */ | ||
887 | if (aic3x->master) { | ||
888 | /* disable pll */ | ||
889 | reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); | ||
890 | aic3x_write(codec, AIC3X_PLL_PROGA_REG, | ||
891 | reg & ~PLL_ENABLE); | ||
892 | } | ||
893 | break; | ||
894 | case SNDRV_CTL_POWER_D3cold: | ||
895 | /* force all power off */ | ||
896 | reg = aic3x_read_reg_cache(codec, LINE1L_2_LADC_CTRL); | ||
897 | aic3x_write(codec, LINE1L_2_LADC_CTRL, reg & ~LADC_PWR_ON); | ||
898 | reg = aic3x_read_reg_cache(codec, LINE1R_2_RADC_CTRL); | ||
899 | aic3x_write(codec, LINE1R_2_RADC_CTRL, reg & ~RADC_PWR_ON); | ||
900 | |||
901 | reg = aic3x_read_reg_cache(codec, DAC_PWR); | ||
902 | aic3x_write(codec, DAC_PWR, reg & ~(LDAC_PWR_ON | RDAC_PWR_ON)); | ||
903 | |||
904 | reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL); | ||
905 | aic3x_write(codec, HPLOUT_CTRL, reg & ~HPLOUT_PWR_ON); | ||
906 | reg = aic3x_read_reg_cache(codec, HPROUT_CTRL); | ||
907 | aic3x_write(codec, HPROUT_CTRL, reg & ~HPROUT_PWR_ON); | ||
908 | |||
909 | reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL); | ||
910 | aic3x_write(codec, HPLCOM_CTRL, reg & ~HPLCOM_PWR_ON); | ||
911 | reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL); | ||
912 | aic3x_write(codec, HPRCOM_CTRL, reg & ~HPRCOM_PWR_ON); | ||
913 | |||
914 | reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL); | ||
915 | aic3x_write(codec, MONOLOPM_CTRL, reg & ~MONOLOPM_PWR_ON); | ||
916 | |||
917 | reg = aic3x_read_reg_cache(codec, LLOPM_CTRL); | ||
918 | aic3x_write(codec, LLOPM_CTRL, reg & ~LLOPM_PWR_ON); | ||
919 | reg = aic3x_read_reg_cache(codec, RLOPM_CTRL); | ||
920 | aic3x_write(codec, RLOPM_CTRL, reg & ~RLOPM_PWR_ON); | ||
921 | |||
922 | if (aic3x->master) { | ||
923 | /* disable pll */ | ||
924 | reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); | ||
925 | aic3x_write(codec, AIC3X_PLL_PROGA_REG, | ||
926 | reg & ~PLL_ENABLE); | ||
927 | } | ||
928 | break; | ||
929 | } | ||
930 | codec->dapm_state = event; | ||
931 | |||
932 | return 0; | ||
933 | } | ||
934 | |||
935 | #define AIC3X_RATES SNDRV_PCM_RATE_8000_96000 | ||
936 | #define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ | ||
937 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) | ||
938 | |||
939 | struct snd_soc_codec_dai aic3x_dai = { | ||
940 | .name = "aic3x", | ||
941 | .playback = { | ||
942 | .stream_name = "Playback", | ||
943 | .channels_min = 1, | ||
944 | .channels_max = 2, | ||
945 | .rates = AIC3X_RATES, | ||
946 | .formats = AIC3X_FORMATS,}, | ||
947 | .capture = { | ||
948 | .stream_name = "Capture", | ||
949 | .channels_min = 1, | ||
950 | .channels_max = 2, | ||
951 | .rates = AIC3X_RATES, | ||
952 | .formats = AIC3X_FORMATS,}, | ||
953 | .ops = { | ||
954 | .hw_params = aic3x_hw_params, | ||
955 | }, | ||
956 | .dai_ops = { | ||
957 | .digital_mute = aic3x_mute, | ||
958 | .set_sysclk = aic3x_set_dai_sysclk, | ||
959 | .set_fmt = aic3x_set_dai_fmt, | ||
960 | } | ||
961 | }; | ||
962 | EXPORT_SYMBOL_GPL(aic3x_dai); | ||
963 | |||
964 | static int aic3x_suspend(struct platform_device *pdev, pm_message_t state) | ||
965 | { | ||
966 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
967 | struct snd_soc_codec *codec = socdev->codec; | ||
968 | |||
969 | aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3cold); | ||
970 | |||
971 | return 0; | ||
972 | } | ||
973 | |||
974 | static int aic3x_resume(struct platform_device *pdev) | ||
975 | { | ||
976 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
977 | struct snd_soc_codec *codec = socdev->codec; | ||
978 | int i; | ||
979 | u8 data[2]; | ||
980 | u8 *cache = codec->reg_cache; | ||
981 | |||
982 | /* Sync reg_cache with the hardware */ | ||
983 | for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++) { | ||
984 | data[0] = i; | ||
985 | data[1] = cache[i]; | ||
986 | codec->hw_write(codec->control_data, data, 2); | ||
987 | } | ||
988 | |||
989 | aic3x_dapm_event(codec, codec->suspend_dapm_state); | ||
990 | |||
991 | return 0; | ||
992 | } | ||
993 | |||
994 | /* | ||
995 | * initialise the AIC3X driver | ||
996 | * register the mixer and dsp interfaces with the kernel | ||
997 | */ | ||
998 | static int aic3x_init(struct snd_soc_device *socdev) | ||
999 | { | ||
1000 | struct snd_soc_codec *codec = socdev->codec; | ||
1001 | int reg, ret = 0; | ||
1002 | |||
1003 | codec->name = "aic3x"; | ||
1004 | codec->owner = THIS_MODULE; | ||
1005 | codec->read = aic3x_read_reg_cache; | ||
1006 | codec->write = aic3x_write; | ||
1007 | codec->dapm_event = aic3x_dapm_event; | ||
1008 | codec->dai = &aic3x_dai; | ||
1009 | codec->num_dai = 1; | ||
1010 | codec->reg_cache_size = sizeof(aic3x_reg); | ||
1011 | codec->reg_cache = kmemdup(aic3x_reg, sizeof(aic3x_reg), GFP_KERNEL); | ||
1012 | if (codec->reg_cache == NULL) | ||
1013 | return -ENOMEM; | ||
1014 | |||
1015 | aic3x_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT); | ||
1016 | aic3x_write(codec, AIC3X_RESET, SOFT_RESET); | ||
1017 | |||
1018 | /* register pcms */ | ||
1019 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
1020 | if (ret < 0) { | ||
1021 | printk(KERN_ERR "aic3x: failed to create pcms\n"); | ||
1022 | goto pcm_err; | ||
1023 | } | ||
1024 | |||
1025 | /* DAC default volume and mute */ | ||
1026 | aic3x_write(codec, LDAC_VOL, DEFAULT_VOL | MUTE_ON); | ||
1027 | aic3x_write(codec, RDAC_VOL, DEFAULT_VOL | MUTE_ON); | ||
1028 | |||
1029 | /* DAC to HP default volume and route to Output mixer */ | ||
1030 | aic3x_write(codec, DACL1_2_HPLOUT_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1031 | aic3x_write(codec, DACR1_2_HPROUT_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1032 | aic3x_write(codec, DACL1_2_HPLCOM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1033 | aic3x_write(codec, DACR1_2_HPRCOM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1034 | /* DAC to Line Out default volume and route to Output mixer */ | ||
1035 | aic3x_write(codec, DACL1_2_LLOPM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1036 | aic3x_write(codec, DACR1_2_RLOPM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1037 | /* DAC to Mono Line Out default volume and route to Output mixer */ | ||
1038 | aic3x_write(codec, DACL1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1039 | aic3x_write(codec, DACR1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); | ||
1040 | |||
1041 | /* unmute all outputs */ | ||
1042 | reg = aic3x_read_reg_cache(codec, LLOPM_CTRL); | ||
1043 | aic3x_write(codec, LLOPM_CTRL, reg | UNMUTE); | ||
1044 | reg = aic3x_read_reg_cache(codec, RLOPM_CTRL); | ||
1045 | aic3x_write(codec, RLOPM_CTRL, reg | UNMUTE); | ||
1046 | reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL); | ||
1047 | aic3x_write(codec, MONOLOPM_CTRL, reg | UNMUTE); | ||
1048 | reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL); | ||
1049 | aic3x_write(codec, HPLOUT_CTRL, reg | UNMUTE); | ||
1050 | reg = aic3x_read_reg_cache(codec, HPROUT_CTRL); | ||
1051 | aic3x_write(codec, HPROUT_CTRL, reg | UNMUTE); | ||
1052 | reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL); | ||
1053 | aic3x_write(codec, HPLCOM_CTRL, reg | UNMUTE); | ||
1054 | reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL); | ||
1055 | aic3x_write(codec, HPRCOM_CTRL, reg | UNMUTE); | ||
1056 | |||
1057 | /* ADC default volume and unmute */ | ||
1058 | aic3x_write(codec, LADC_VOL, DEFAULT_GAIN); | ||
1059 | aic3x_write(codec, RADC_VOL, DEFAULT_GAIN); | ||
1060 | /* By default route Line1 to ADC PGA mixer */ | ||
1061 | aic3x_write(codec, LINE1L_2_LADC_CTRL, 0x0); | ||
1062 | aic3x_write(codec, LINE1R_2_RADC_CTRL, 0x0); | ||
1063 | |||
1064 | /* PGA to HP Bypass default volume, disconnect from Output Mixer */ | ||
1065 | aic3x_write(codec, PGAL_2_HPLOUT_VOL, DEFAULT_VOL); | ||
1066 | aic3x_write(codec, PGAR_2_HPROUT_VOL, DEFAULT_VOL); | ||
1067 | aic3x_write(codec, PGAL_2_HPLCOM_VOL, DEFAULT_VOL); | ||
1068 | aic3x_write(codec, PGAR_2_HPRCOM_VOL, DEFAULT_VOL); | ||
1069 | /* PGA to Line Out default volume, disconnect from Output Mixer */ | ||
1070 | aic3x_write(codec, PGAL_2_LLOPM_VOL, DEFAULT_VOL); | ||
1071 | aic3x_write(codec, PGAR_2_RLOPM_VOL, DEFAULT_VOL); | ||
1072 | /* PGA to Mono Line Out default volume, disconnect from Output Mixer */ | ||
1073 | aic3x_write(codec, PGAL_2_MONOLOPM_VOL, DEFAULT_VOL); | ||
1074 | aic3x_write(codec, PGAR_2_MONOLOPM_VOL, DEFAULT_VOL); | ||
1075 | |||
1076 | /* Line2 to HP Bypass default volume, disconnect from Output Mixer */ | ||
1077 | aic3x_write(codec, LINE2L_2_HPLOUT_VOL, DEFAULT_VOL); | ||
1078 | aic3x_write(codec, LINE2R_2_HPROUT_VOL, DEFAULT_VOL); | ||
1079 | aic3x_write(codec, LINE2L_2_HPLCOM_VOL, DEFAULT_VOL); | ||
1080 | aic3x_write(codec, LINE2R_2_HPRCOM_VOL, DEFAULT_VOL); | ||
1081 | /* Line2 Line Out default volume, disconnect from Output Mixer */ | ||
1082 | aic3x_write(codec, LINE2L_2_LLOPM_VOL, DEFAULT_VOL); | ||
1083 | aic3x_write(codec, LINE2R_2_RLOPM_VOL, DEFAULT_VOL); | ||
1084 | /* Line2 to Mono Out default volume, disconnect from Output Mixer */ | ||
1085 | aic3x_write(codec, LINE2L_2_MONOLOPM_VOL, DEFAULT_VOL); | ||
1086 | aic3x_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL); | ||
1087 | |||
1088 | /* off, with power on */ | ||
1089 | aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3hot); | ||
1090 | |||
1091 | aic3x_add_controls(codec); | ||
1092 | aic3x_add_widgets(codec); | ||
1093 | ret = snd_soc_register_card(socdev); | ||
1094 | if (ret < 0) { | ||
1095 | printk(KERN_ERR "aic3x: failed to register card\n"); | ||
1096 | goto card_err; | ||
1097 | } | ||
1098 | |||
1099 | return ret; | ||
1100 | |||
1101 | card_err: | ||
1102 | snd_soc_free_pcms(socdev); | ||
1103 | snd_soc_dapm_free(socdev); | ||
1104 | pcm_err: | ||
1105 | kfree(codec->reg_cache); | ||
1106 | return ret; | ||
1107 | } | ||
1108 | |||
1109 | static struct snd_soc_device *aic3x_socdev; | ||
1110 | |||
1111 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1112 | /* | ||
1113 | * AIC3X 2 wire address can be up to 4 devices with device addresses | ||
1114 | * 0x18, 0x19, 0x1A, 0x1B | ||
1115 | */ | ||
1116 | static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; | ||
1117 | |||
1118 | /* Magic definition of all other variables and things */ | ||
1119 | I2C_CLIENT_INSMOD; | ||
1120 | |||
1121 | static struct i2c_driver aic3x_i2c_driver; | ||
1122 | static struct i2c_client client_template; | ||
1123 | |||
1124 | /* | ||
1125 | * If the i2c layer weren't so broken, we could pass this kind of data | ||
1126 | * around | ||
1127 | */ | ||
1128 | static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) | ||
1129 | { | ||
1130 | struct snd_soc_device *socdev = aic3x_socdev; | ||
1131 | struct aic3x_setup_data *setup = socdev->codec_data; | ||
1132 | struct snd_soc_codec *codec = socdev->codec; | ||
1133 | struct i2c_client *i2c; | ||
1134 | int ret; | ||
1135 | |||
1136 | if (addr != setup->i2c_address) | ||
1137 | return -ENODEV; | ||
1138 | |||
1139 | client_template.adapter = adap; | ||
1140 | client_template.addr = addr; | ||
1141 | |||
1142 | i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); | ||
1143 | if (i2c == NULL) { | ||
1144 | kfree(codec); | ||
1145 | return -ENOMEM; | ||
1146 | } | ||
1147 | i2c_set_clientdata(i2c, codec); | ||
1148 | codec->control_data = i2c; | ||
1149 | |||
1150 | ret = i2c_attach_client(i2c); | ||
1151 | if (ret < 0) { | ||
1152 | printk(KERN_ERR "aic3x: failed to attach codec at addr %x\n", | ||
1153 | addr); | ||
1154 | goto err; | ||
1155 | } | ||
1156 | |||
1157 | ret = aic3x_init(socdev); | ||
1158 | if (ret < 0) { | ||
1159 | printk(KERN_ERR "aic3x: failed to initialise AIC3X\n"); | ||
1160 | goto err; | ||
1161 | } | ||
1162 | return ret; | ||
1163 | |||
1164 | err: | ||
1165 | kfree(codec); | ||
1166 | kfree(i2c); | ||
1167 | return ret; | ||
1168 | } | ||
1169 | |||
1170 | static int aic3x_i2c_detach(struct i2c_client *client) | ||
1171 | { | ||
1172 | struct snd_soc_codec *codec = i2c_get_clientdata(client); | ||
1173 | i2c_detach_client(client); | ||
1174 | kfree(codec->reg_cache); | ||
1175 | kfree(client); | ||
1176 | return 0; | ||
1177 | } | ||
1178 | |||
1179 | static int aic3x_i2c_attach(struct i2c_adapter *adap) | ||
1180 | { | ||
1181 | return i2c_probe(adap, &addr_data, aic3x_codec_probe); | ||
1182 | } | ||
1183 | |||
1184 | /* machine i2c codec control layer */ | ||
1185 | static struct i2c_driver aic3x_i2c_driver = { | ||
1186 | .driver = { | ||
1187 | .name = "aic3x I2C Codec", | ||
1188 | .owner = THIS_MODULE, | ||
1189 | }, | ||
1190 | .id = I2C_DRIVERID_I2CDEV, | ||
1191 | .attach_adapter = aic3x_i2c_attach, | ||
1192 | .detach_client = aic3x_i2c_detach, | ||
1193 | .command = NULL, | ||
1194 | }; | ||
1195 | |||
1196 | static struct i2c_client client_template = { | ||
1197 | .name = "AIC3X", | ||
1198 | .driver = &aic3x_i2c_driver, | ||
1199 | }; | ||
1200 | #endif | ||
1201 | |||
1202 | static int aic3x_probe(struct platform_device *pdev) | ||
1203 | { | ||
1204 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1205 | struct aic3x_setup_data *setup; | ||
1206 | struct snd_soc_codec *codec; | ||
1207 | struct aic3x_priv *aic3x; | ||
1208 | int ret = 0; | ||
1209 | |||
1210 | printk(KERN_INFO "AIC3X Audio Codec %s\n", AIC3X_VERSION); | ||
1211 | |||
1212 | setup = socdev->codec_data; | ||
1213 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); | ||
1214 | if (codec == NULL) | ||
1215 | return -ENOMEM; | ||
1216 | |||
1217 | aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL); | ||
1218 | if (aic3x == NULL) { | ||
1219 | kfree(codec); | ||
1220 | return -ENOMEM; | ||
1221 | } | ||
1222 | |||
1223 | codec->private_data = aic3x; | ||
1224 | socdev->codec = codec; | ||
1225 | mutex_init(&codec->mutex); | ||
1226 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
1227 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
1228 | |||
1229 | aic3x_socdev = socdev; | ||
1230 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1231 | if (setup->i2c_address) { | ||
1232 | normal_i2c[0] = setup->i2c_address; | ||
1233 | codec->hw_write = (hw_write_t) i2c_master_send; | ||
1234 | ret = i2c_add_driver(&aic3x_i2c_driver); | ||
1235 | if (ret != 0) | ||
1236 | printk(KERN_ERR "can't add i2c driver"); | ||
1237 | } | ||
1238 | #else | ||
1239 | /* Add other interfaces here */ | ||
1240 | #endif | ||
1241 | return ret; | ||
1242 | } | ||
1243 | |||
1244 | static int aic3x_remove(struct platform_device *pdev) | ||
1245 | { | ||
1246 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1247 | struct snd_soc_codec *codec = socdev->codec; | ||
1248 | |||
1249 | /* power down chip */ | ||
1250 | if (codec->control_data) | ||
1251 | aic3x_dapm_event(codec, SNDRV_CTL_POWER_D3); | ||
1252 | |||
1253 | snd_soc_free_pcms(socdev); | ||
1254 | snd_soc_dapm_free(socdev); | ||
1255 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1256 | i2c_del_driver(&aic3x_i2c_driver); | ||
1257 | #endif | ||
1258 | kfree(codec->private_data); | ||
1259 | kfree(codec); | ||
1260 | |||
1261 | return 0; | ||
1262 | } | ||
1263 | |||
1264 | struct snd_soc_codec_device soc_codec_dev_aic3x = { | ||
1265 | .probe = aic3x_probe, | ||
1266 | .remove = aic3x_remove, | ||
1267 | .suspend = aic3x_suspend, | ||
1268 | .resume = aic3x_resume, | ||
1269 | }; | ||
1270 | EXPORT_SYMBOL_GPL(soc_codec_dev_aic3x); | ||
1271 | |||
1272 | MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver"); | ||
1273 | MODULE_AUTHOR("Vladimir Barinov"); | ||
1274 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h new file mode 100644 index 000000000000..d0cdeeb629de --- /dev/null +++ b/sound/soc/codecs/tlv320aic3x.h | |||
@@ -0,0 +1,181 @@ | |||
1 | /* | ||
2 | * ALSA SoC TLV320AIC3X codec driver | ||
3 | * | ||
4 | * Author: Vladimir Barinov, <vbarinov@ru.mvista.com> | ||
5 | * Copyright: (C) 2007 MontaVista Software, Inc., <source@mvista.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef _AIC3X_H | ||
13 | #define _AIC3X_H | ||
14 | |||
15 | /* AIC3X register space */ | ||
16 | #define AIC3X_CACHEREGNUM 103 | ||
17 | |||
18 | /* Page select register */ | ||
19 | #define AIC3X_PAGE_SELECT 0 | ||
20 | /* Software reset register */ | ||
21 | #define AIC3X_RESET 1 | ||
22 | /* Codec Sample rate select register */ | ||
23 | #define AIC3X_SAMPLE_RATE_SEL_REG 2 | ||
24 | /* PLL progrramming register A */ | ||
25 | #define AIC3X_PLL_PROGA_REG 3 | ||
26 | /* PLL progrramming register B */ | ||
27 | #define AIC3X_PLL_PROGB_REG 4 | ||
28 | /* PLL progrramming register C */ | ||
29 | #define AIC3X_PLL_PROGC_REG 5 | ||
30 | /* PLL progrramming register D */ | ||
31 | #define AIC3X_PLL_PROGD_REG 6 | ||
32 | /* Codec datapath setup register */ | ||
33 | #define AIC3X_CODEC_DATAPATH_REG 7 | ||
34 | /* Audio serial data interface control register A */ | ||
35 | #define AIC3X_ASD_INTF_CTRLA 8 | ||
36 | /* Audio serial data interface control register B */ | ||
37 | #define AIC3X_ASD_INTF_CTRLB 9 | ||
38 | /* Audio overflow status and PLL R value programming register */ | ||
39 | #define AIC3X_OVRF_STATUS_AND_PLLR_REG 11 | ||
40 | |||
41 | /* ADC PGA Gain control registers */ | ||
42 | #define LADC_VOL 15 | ||
43 | #define RADC_VOL 16 | ||
44 | /* MIC3 control registers */ | ||
45 | #define MIC3LR_2_LADC_CTRL 17 | ||
46 | #define MIC3LR_2_RADC_CTRL 18 | ||
47 | /* Line1 Input control registers */ | ||
48 | #define LINE1L_2_LADC_CTRL 19 | ||
49 | #define LINE1R_2_RADC_CTRL 22 | ||
50 | /* Line2 Input control registers */ | ||
51 | #define LINE2L_2_LADC_CTRL 20 | ||
52 | #define LINE2R_2_RADC_CTRL 23 | ||
53 | /* MICBIAS Control Register */ | ||
54 | #define MICBIAS_CTRL 25 | ||
55 | |||
56 | /* AGC Control Registers A, B, C */ | ||
57 | #define LAGC_CTRL_A 26 | ||
58 | #define LAGC_CTRL_B 27 | ||
59 | #define LAGC_CTRL_C 28 | ||
60 | #define RAGC_CTRL_A 29 | ||
61 | #define RAGC_CTRL_B 30 | ||
62 | #define RAGC_CTRL_C 31 | ||
63 | |||
64 | /* DAC Power and Left High Power Output control registers */ | ||
65 | #define DAC_PWR 37 | ||
66 | #define HPLCOM_CFG 37 | ||
67 | /* Right High Power Output control registers */ | ||
68 | #define HPRCOM_CFG 38 | ||
69 | /* DAC Output Switching control registers */ | ||
70 | #define DAC_LINE_MUX 41 | ||
71 | /* High Power Output Driver Pop Reduction registers */ | ||
72 | #define HPOUT_POP_REDUCTION 42 | ||
73 | /* DAC Digital control registers */ | ||
74 | #define LDAC_VOL 43 | ||
75 | #define RDAC_VOL 44 | ||
76 | /* High Power Output control registers */ | ||
77 | #define LINE2L_2_HPLOUT_VOL 45 | ||
78 | #define LINE2R_2_HPROUT_VOL 62 | ||
79 | #define PGAL_2_HPLOUT_VOL 46 | ||
80 | #define PGAR_2_HPROUT_VOL 63 | ||
81 | #define DACL1_2_HPLOUT_VOL 47 | ||
82 | #define DACR1_2_HPROUT_VOL 64 | ||
83 | #define HPLOUT_CTRL 51 | ||
84 | #define HPROUT_CTRL 65 | ||
85 | /* High Power COM control registers */ | ||
86 | #define LINE2L_2_HPLCOM_VOL 52 | ||
87 | #define LINE2R_2_HPRCOM_VOL 69 | ||
88 | #define PGAL_2_HPLCOM_VOL 53 | ||
89 | #define PGAR_2_HPRCOM_VOL 70 | ||
90 | #define DACL1_2_HPLCOM_VOL 54 | ||
91 | #define DACR1_2_HPRCOM_VOL 71 | ||
92 | #define HPLCOM_CTRL 58 | ||
93 | #define HPRCOM_CTRL 72 | ||
94 | /* Mono Line Output Plus/Minus control registers */ | ||
95 | #define LINE2L_2_MONOLOPM_VOL 73 | ||
96 | #define LINE2R_2_MONOLOPM_VOL 76 | ||
97 | #define PGAL_2_MONOLOPM_VOL 74 | ||
98 | #define PGAR_2_MONOLOPM_VOL 77 | ||
99 | #define DACL1_2_MONOLOPM_VOL 75 | ||
100 | #define DACR1_2_MONOLOPM_VOL 78 | ||
101 | #define MONOLOPM_CTRL 79 | ||
102 | /* Line Output Plus/Minus control registers */ | ||
103 | #define LINE2L_2_LLOPM_VOL 80 | ||
104 | #define LINE2R_2_RLOPM_VOL 90 | ||
105 | #define PGAL_2_LLOPM_VOL 81 | ||
106 | #define PGAR_2_RLOPM_VOL 91 | ||
107 | #define DACL1_2_LLOPM_VOL 82 | ||
108 | #define DACR1_2_RLOPM_VOL 92 | ||
109 | #define LLOPM_CTRL 86 | ||
110 | #define RLOPM_CTRL 93 | ||
111 | /* Clock generation control register */ | ||
112 | #define AIC3X_CLKGEN_CTRL_REG 102 | ||
113 | |||
114 | /* Page select register bits */ | ||
115 | #define PAGE0_SELECT 0 | ||
116 | #define PAGE1_SELECT 1 | ||
117 | |||
118 | /* Audio serial data interface control register A bits */ | ||
119 | #define BIT_CLK_MASTER 0x80 | ||
120 | #define WORD_CLK_MASTER 0x40 | ||
121 | |||
122 | /* Codec Datapath setup register 7 */ | ||
123 | #define FSREF_44100 (1 << 7) | ||
124 | #define FSREF_48000 (0 << 7) | ||
125 | #define DUAL_RATE_MODE ((1 << 5) | (1 << 6)) | ||
126 | #define LDAC2LCH (0x1 << 3) | ||
127 | #define RDAC2RCH (0x1 << 1) | ||
128 | |||
129 | /* PLL registers bitfields */ | ||
130 | #define PLLP_SHIFT 0 | ||
131 | #define PLLR_SHIFT 0 | ||
132 | #define PLLJ_SHIFT 2 | ||
133 | #define PLLD_MSB_SHIFT 0 | ||
134 | #define PLLD_LSB_SHIFT 2 | ||
135 | |||
136 | /* Clock generation register bits */ | ||
137 | #define PLL_CLKIN_SHIFT 4 | ||
138 | #define MCLK_SOURCE 0x0 | ||
139 | #define PLL_CLKDIV_SHIFT 0 | ||
140 | |||
141 | /* Software reset register bits */ | ||
142 | #define SOFT_RESET 0x80 | ||
143 | |||
144 | /* PLL progrramming register A bits */ | ||
145 | #define PLL_ENABLE 0x80 | ||
146 | |||
147 | /* Route bits */ | ||
148 | #define ROUTE_ON 0x80 | ||
149 | |||
150 | /* Mute bits */ | ||
151 | #define UNMUTE 0x08 | ||
152 | #define MUTE_ON 0x80 | ||
153 | |||
154 | /* Power bits */ | ||
155 | #define LADC_PWR_ON 0x04 | ||
156 | #define RADC_PWR_ON 0x04 | ||
157 | #define LDAC_PWR_ON 0x80 | ||
158 | #define RDAC_PWR_ON 0x40 | ||
159 | #define HPLOUT_PWR_ON 0x01 | ||
160 | #define HPROUT_PWR_ON 0x01 | ||
161 | #define HPLCOM_PWR_ON 0x01 | ||
162 | #define HPRCOM_PWR_ON 0x01 | ||
163 | #define MONOLOPM_PWR_ON 0x01 | ||
164 | #define LLOPM_PWR_ON 0x01 | ||
165 | #define RLOPM_PWR_ON 0x01 | ||
166 | |||
167 | #define INVERT_VOL(val) (0x7f - val) | ||
168 | |||
169 | /* Default output volume (inverted) */ | ||
170 | #define DEFAULT_VOL INVERT_VOL(0x50) | ||
171 | /* Default input volume */ | ||
172 | #define DEFAULT_GAIN 0x20 | ||
173 | |||
174 | struct aic3x_setup_data { | ||
175 | unsigned short i2c_address; | ||
176 | }; | ||
177 | |||
178 | extern struct snd_soc_codec_dai aic3x_dai; | ||
179 | extern struct snd_soc_codec_device soc_codec_dev_aic3x; | ||
180 | |||
181 | #endif /* _AIC3X_H */ | ||
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 7ca0b5268289..9c33fe874928 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <sound/driver.h> | ||
23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
25 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
@@ -562,13 +561,13 @@ static int wm8731_init(struct snd_soc_device *socdev) | |||
562 | 561 | ||
563 | /* set the update bits */ | 562 | /* set the update bits */ |
564 | reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V); | 563 | reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V); |
565 | wm8731_write(codec, WM8731_LOUT1V, reg | 0x0100); | 564 | wm8731_write(codec, WM8731_LOUT1V, reg & ~0x0100); |
566 | reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V); | 565 | reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V); |
567 | wm8731_write(codec, WM8731_ROUT1V, reg | 0x0100); | 566 | wm8731_write(codec, WM8731_ROUT1V, reg & ~0x0100); |
568 | reg = wm8731_read_reg_cache(codec, WM8731_LINVOL); | 567 | reg = wm8731_read_reg_cache(codec, WM8731_LINVOL); |
569 | wm8731_write(codec, WM8731_LINVOL, reg | 0x0100); | 568 | wm8731_write(codec, WM8731_LINVOL, reg & ~0x0100); |
570 | reg = wm8731_read_reg_cache(codec, WM8731_RINVOL); | 569 | reg = wm8731_read_reg_cache(codec, WM8731_RINVOL); |
571 | wm8731_write(codec, WM8731_RINVOL, reg | 0x0100); | 570 | wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100); |
572 | 571 | ||
573 | wm8731_add_controls(codec); | 572 | wm8731_add_controls(codec); |
574 | wm8731_add_widgets(codec); | 573 | wm8731_add_widgets(codec); |
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 28684eeda738..77a857b997a2 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <sound/driver.h> | ||
23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
25 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
@@ -189,7 +188,7 @@ SOC_ENUM("Bass Boost", wm8750_enum[0]), | |||
189 | SOC_ENUM("Bass Filter", wm8750_enum[1]), | 188 | SOC_ENUM("Bass Filter", wm8750_enum[1]), |
190 | SOC_SINGLE("Bass Volume", WM8750_BASS, 0, 15, 1), | 189 | SOC_SINGLE("Bass Volume", WM8750_BASS, 0, 15, 1), |
191 | 190 | ||
192 | SOC_SINGLE("Treble Volume", WM8750_TREBLE, 0, 15, 0), | 191 | SOC_SINGLE("Treble Volume", WM8750_TREBLE, 0, 15, 1), |
193 | SOC_ENUM("Treble Cut-off", wm8750_enum[2]), | 192 | SOC_ENUM("Treble Cut-off", wm8750_enum[2]), |
194 | 193 | ||
195 | SOC_SINGLE("3D Switch", WM8750_3D, 0, 1, 0), | 194 | SOC_SINGLE("3D Switch", WM8750_3D, 0, 1, 0), |
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index efced934566d..ddd9c71b3fde 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -41,13 +41,13 @@ | |||
41 | #include <linux/pm.h> | 41 | #include <linux/pm.h> |
42 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
43 | #include <linux/platform_device.h> | 43 | #include <linux/platform_device.h> |
44 | #include <sound/driver.h> | ||
45 | #include <sound/core.h> | 44 | #include <sound/core.h> |
46 | #include <sound/pcm.h> | 45 | #include <sound/pcm.h> |
47 | #include <sound/pcm_params.h> | 46 | #include <sound/pcm_params.h> |
48 | #include <sound/soc.h> | 47 | #include <sound/soc.h> |
49 | #include <sound/soc-dapm.h> | 48 | #include <sound/soc-dapm.h> |
50 | #include <sound/initval.h> | 49 | #include <sound/initval.h> |
50 | #include <sound/tlv.h> | ||
51 | #include <asm/div64.h> | 51 | #include <asm/div64.h> |
52 | 52 | ||
53 | #include "wm8753.h" | 53 | #include "wm8753.h" |
@@ -258,6 +258,8 @@ static int wm8753_set_dai(struct snd_kcontrol *kcontrol, | |||
258 | return 1; | 258 | return 1; |
259 | } | 259 | } |
260 | 260 | ||
261 | static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); | ||
262 | |||
261 | static const struct snd_kcontrol_new wm8753_snd_controls[] = { | 263 | static const struct snd_kcontrol_new wm8753_snd_controls[] = { |
262 | SOC_DOUBLE_R("PCM Volume", WM8753_LDAC, WM8753_RDAC, 0, 255, 0), | 264 | SOC_DOUBLE_R("PCM Volume", WM8753_LDAC, WM8753_RDAC, 0, 255, 0), |
263 | 265 | ||
@@ -287,8 +289,8 @@ SOC_SINGLE("Bass Volume", WM8753_BASS, 0, 15, 1), | |||
287 | SOC_SINGLE("Treble Volume", WM8753_TREBLE, 0, 15, 1), | 289 | SOC_SINGLE("Treble Volume", WM8753_TREBLE, 0, 15, 1), |
288 | SOC_ENUM("Treble Cut-off", wm8753_enum[2]), | 290 | SOC_ENUM("Treble Cut-off", wm8753_enum[2]), |
289 | 291 | ||
290 | SOC_DOUBLE("Sidetone Capture Volume", WM8753_RECMIX1, 0, 4, 7, 1), | 292 | SOC_DOUBLE_TLV("Sidetone Capture Volume", WM8753_RECMIX1, 0, 4, 7, 1, rec_mix_tlv), |
291 | SOC_SINGLE("Voice Sidetone Capture Volume", WM8753_RECMIX2, 0, 7, 1), | 293 | SOC_SINGLE_TLV("Voice Sidetone Capture Volume", WM8753_RECMIX2, 0, 7, 1, rec_mix_tlv), |
292 | 294 | ||
293 | SOC_DOUBLE_R("Capture Volume", WM8753_LINVOL, WM8753_RINVOL, 0, 63, 0), | 295 | SOC_DOUBLE_R("Capture Volume", WM8753_LINVOL, WM8753_RINVOL, 0, 63, 0), |
294 | SOC_DOUBLE_R("Capture ZC Switch", WM8753_LINVOL, WM8753_RINVOL, 6, 1, 0), | 296 | SOC_DOUBLE_R("Capture ZC Switch", WM8753_LINVOL, WM8753_RINVOL, 6, 1, 0), |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 986b5d59cefa..590baea3c4c3 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/version.h> | 19 | #include <linux/version.h> |
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
22 | #include <sound/driver.h> | ||
23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
24 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
25 | #include <sound/ac97_codec.h> | 24 | #include <sound/ac97_codec.h> |
@@ -102,7 +101,8 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0), | |||
102 | SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0), | 101 | SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0), |
103 | SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0), | 102 | SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0), |
104 | SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0), | 103 | SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0), |
105 | SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0), | 104 | SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1), |
105 | SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1), | ||
106 | 106 | ||
107 | SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0), | 107 | SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0), |
108 | SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0), | 108 | SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0), |
@@ -131,7 +131,7 @@ SOC_SINGLE("Aux Playback Headphone Volume", AC97_CD, 12, 7, 1), | |||
131 | SOC_SINGLE("Aux Playback Speaker Volume", AC97_CD, 8, 7, 1), | 131 | SOC_SINGLE("Aux Playback Speaker Volume", AC97_CD, 8, 7, 1), |
132 | SOC_SINGLE("Aux Playback Phone Volume", AC97_CD, 4, 7, 1), | 132 | SOC_SINGLE("Aux Playback Phone Volume", AC97_CD, 4, 7, 1), |
133 | 133 | ||
134 | SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 0), | 134 | SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 1), |
135 | SOC_DOUBLE("Line Capture Volume", AC97_LINE, 8, 0, 31, 1), | 135 | SOC_DOUBLE("Line Capture Volume", AC97_LINE, 8, 0, 31, 1), |
136 | 136 | ||
137 | SOC_SINGLE("Capture 20dB Boost Switch", AC97_REC_SEL, 14, 1, 0), | 137 | SOC_SINGLE("Capture 20dB Boost Switch", AC97_REC_SEL, 14, 1, 0), |
@@ -145,8 +145,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]), | |||
145 | SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1), | 145 | SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1), |
146 | SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1), | 146 | SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1), |
147 | SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0), | 147 | SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0), |
148 | SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0), | 148 | SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1), |
149 | SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0), | 149 | SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1), |
150 | 150 | ||
151 | SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1), | 151 | SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1), |
152 | SOC_ENUM("Capture Volume Steps", wm9712_enum[6]), | 152 | SOC_ENUM("Capture Volume Steps", wm9712_enum[6]), |