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

Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0

Browse Source
This commit is contained in:
黄涛
2012-10-08 10:35:25 +08:00
parent 21158e22d9 2d947e285e
commit cb43413bdb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/rk2928_codec.c
View File

@@ -90,6 +90,9 @@ static int rk2928_write(struct snd_soc_codec *codec, unsigned int reg, unsigned
{
DBG("%s reg 0x%02x value 0x%02x", __FUNCTION__, reg, value);
writel(value, rk2928_data.regbase + reg*4);
if( (reg == CODEC_REG_POWER) && ( (value & m_PD_DAC) == 0)) {
msleep(80);
}
return 0;
}
@@ -154,7 +157,6 @@ static int rk2928_audio_trigger(struct snd_pcm_substream *substream, int cmd,
rk2928_write(codec, CODEC_REG_DAC_MUTE, v_MUTE_DAC(0));
rk2928_data.mute = 0;
if(rk2928_data.spkctl != INVALID_GPIO) {
msleep(80);
gpio_direction_output(rk2928_data.spkctl, GPIO_HIGH);
}
}