.. | .. |
---|
200 | 200 | unsigned int dai_fmt; |
---|
201 | 201 | |
---|
202 | 202 | dai_fmt = rtd->card->dai_link[0].dai_fmt; |
---|
203 | | - iface = snd_soc_component_read32(component, ACCELCODEC_R09) & 0x1f3; |
---|
| 203 | + iface = snd_soc_component_read(component, ACCELCODEC_R09) & 0x1f3; |
---|
204 | 204 | snd_soc_component_write(component, ACCELCODEC_R0C, 0x17); |
---|
205 | 205 | snd_soc_component_write(component, ACCELCODEC_R04, |
---|
206 | 206 | ASC_INT_MUTE_L | ASC_INT_MUTE_R | |
---|
.. | .. |
---|
217 | 217 | return 0; |
---|
218 | 218 | } |
---|
219 | 219 | |
---|
220 | | -static int rk1000_codec_mute(struct snd_soc_dai *dai, int mute) |
---|
| 220 | +static int rk1000_codec_mute(struct snd_soc_dai *dai, int mute, int stream) |
---|
221 | 221 | { |
---|
222 | 222 | struct snd_soc_component *component = dai->component; |
---|
223 | 223 | struct rk1000_codec_priv *rk1000_codec; |
---|
.. | .. |
---|
276 | 276 | static struct snd_soc_dai_ops rk1000_codec_ops = { |
---|
277 | 277 | .hw_params = rk1000_codec_pcm_hw_params, |
---|
278 | 278 | .set_fmt = rk1000_codec_set_dai_fmt, |
---|
279 | | - .digital_mute = rk1000_codec_mute, |
---|
| 279 | + .mute_stream = rk1000_codec_mute, |
---|
| 280 | + .no_capture_mute = 1, |
---|
280 | 281 | }; |
---|
281 | 282 | |
---|
282 | 283 | #define RK1000_CODEC_RATES SNDRV_PCM_RATE_8000_192000 |
---|
.. | .. |
---|
355 | 356 | ASC_DITHER_ENABLE | ASC_BCLKDIV_4); |
---|
356 | 357 | /*2volume,input,output*/ |
---|
357 | 358 | digital_gain = VOLUME_OUTPUT; |
---|
358 | | - if (snd_soc_component_read32(component, ACCELCODEC_R05) != 0x0f) { |
---|
| 359 | + if (snd_soc_component_read(component, ACCELCODEC_R05) != 0x0f) { |
---|
359 | 360 | snd_soc_component_write(component, ACCELCODEC_R05, |
---|
360 | 361 | (digital_gain >> 8) & 0xFF); |
---|
361 | 362 | snd_soc_component_write(component, ACCELCODEC_R06, digital_gain & 0xFF); |
---|
362 | 363 | } |
---|
363 | 364 | |
---|
364 | | - if (snd_soc_component_read32(component, ACCELCODEC_R07) != 0x0f) { |
---|
| 365 | + if (snd_soc_component_read(component, ACCELCODEC_R07) != 0x0f) { |
---|
365 | 366 | snd_soc_component_write(component, ACCELCODEC_R07, |
---|
366 | 367 | (digital_gain >> 8) & 0xFF); |
---|
367 | 368 | snd_soc_component_write(component, ACCELCODEC_R08, digital_gain & 0xFF); |
---|