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

ASoC: rockchip: rk817-codec: fixup spk-volume and pdm bug

Browse Source 
Change-Id: Idd7ac0b0a12c75d8c43a57d8c8f9ecfccd399894
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
This commit is contained in:
Binyuan Lan
2018-05-16 10:28:31 +08:00
committed by Tao Huang
parent af008c375a
commit b62b2da7bd
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/codecs/rk817_codec.c
View File

@@ -247,6 +247,14 @@ static int rk817_codec_ctl_gpio(struct rk817_codec_priv *rk817,
return 0;
}
static int rk817_reset(struct snd_soc_codec *codec)
{
snd_soc_write(codec, RK817_CODEC_DTOP_LPT_SRST, 0x40);
snd_soc_write(codec, RK817_CODEC_DDAC_POPD_DACST, 0x02);
return 0;
}
static struct rk817_reg_val_typ playback_power_up_list[] = {
{RK817_CODEC_AREF_RTCFG1, 0x40},
{RK817_CODEC_DDAC_POPD_DACST, 0x02},
@@ -262,7 +270,7 @@ static struct rk817_reg_val_typ playback_power_up_list[] = {
{RK817_CODEC_DI2S_RXCMD_TSD, 0x00},
{RK817_CODEC_DI2S_RSD, 0x00},
{RK817_CODEC_DI2S_CKM, 0x00},
/* {RK817_CODEC_DI2S_CKM, 0x00}, */
{RK817_CODEC_DI2S_RXCR1, 0x00},
{RK817_CODEC_DI2S_RXCMD_TSD, 0x20},
{RK817_CODEC_DTOP_VUCTIME, 0xf4},
@@ -302,7 +310,7 @@ static struct rk817_reg_val_typ capture_power_up_list[] = {
{RK817_CODEC_DI2S_RXCMD_TSD, 0x00},
{RK817_CODEC_DI2S_RSD, 0x00},
{RK817_CODEC_DI2S_CKM, 0x00},
/* {RK817_CODEC_DI2S_CKM, 0x00}, */
{RK817_CODEC_DI2S_RXCR1, 0x00},
{RK817_CODEC_DI2S_RXCMD_TSD, 0x20},
{RK817_CODEC_DTOP_VUCTIME, 0xf4},
@@ -581,10 +589,6 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
}
if (rk817->capture_path != 0 && rk817->pdmdata_out_enable)
snd_soc_update_bits(codec, RK817_CODEC_DI2S_CKM,
PDM_EN_MASK, PDM_EN_ENABLE);
return 0;
}
@@ -893,6 +897,8 @@ static int rk817_probe(struct snd_soc_codec *codec)
rk817->playback_path = OFF;
rk817->capture_path = MIC_OFF;
rk817_reset(codec);
snd_soc_add_codec_controls(codec, rk817_snd_path_controls,
ARRAY_SIZE(rk817_snd_path_controls));
return 0;
@@ -984,9 +990,9 @@ static int rk817_codec_parse_dt_property(struct device *dev,
DBG("spk mute delay %dms --- hp mute delay %dms\n",
rk817->spk_mute_delay, rk817->hp_mute_delay);
ret = of_property_read_u32(node, "skp-volume", &rk817->spk_volume);
ret = of_property_read_u32(node, "spk-volume", &rk817->spk_volume);
if (ret < 0) {
DBG("%s() Can not read property skp-volume\n", __func__);
DBG("%s() Can not read property spk-volume\n", __func__);
rk817->spk_volume = OUT_VOLUME;
}
if (rk817->spk_volume < 3)