shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rk3308_codec: fix the outdated audio route

Browse Source 
The GRF values may be kept the previous status after hot reboot,
if the property 'rockchip,adc-grps-route' is not set, we need to
recover default the order of sdi/sdo for i2s2_8ch/i2s3_8ch/i2s1_2ch.

Change-Id: Ic35b96388aaeca0ed4e0efd4e6ae3de178f88b06
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-08-09 15:16:22 +08:00
committed by Tao Huang
parent 939100f129
commit 3e6aa41798
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/codecs/rk3308_codec.c
View File

@@ -1824,17 +1824,29 @@ static int rk3308_codec_adc_grps_route_config(struct rk3308_codec_priv *rk3308)
/* Put default one-to-one mapping */
static int rk3308_codec_adc_grps_route_default(struct rk3308_codec_priv *rk3308)
{
unsigned int v, idx;
unsigned int idx;
rk3308->which_i2s = ACODEC_TO_I2S2_8CH;
rk3308->to_i2s_grps = ADC_LR_GROUP_MAX;
/*
* The GRF values may be kept the previous status after hot reboot,
* we need to update them.
* if the property 'rockchip,adc-grps-route' is not set, we need to
* recover default the order of sdi/sdo for i2s2_8ch/i2s3_8ch/i2s1_2ch.
*/
for (idx = 0; idx < rk3308->to_i2s_grps; idx++) {
regmap_read(rk3308->grf, GRF_SOC_CON1, &v);
rk3308->i2s_sdis[idx] = GRF_I2S2_8CH_SDI_R_MSK(idx, v);
regmap_write(rk3308->grf, GRF_SOC_CON1,
GRF_I2S1_2CH_SDI(0));
for (idx = 0; idx < 2; idx++) {
regmap_write(rk3308->grf, GRF_SOC_CON1,
GRF_I2S3_4CH_SDI(idx, idx));
}
/* Using i2s2_8ch by default. */
rk3308->which_i2s = ACODEC_TO_I2S2_8CH;
rk3308->to_i2s_grps = ADC_LR_GROUP_MAX;
for (idx = 0; idx < ADC_LR_GROUP_MAX; idx++) {
rk3308->i2s_sdis[idx] = idx;
regmap_write(rk3308->grf, GRF_SOC_CON1,
GRF_I2S2_8CH_SDI(idx, idx));
}
return 0;