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

phonepad: modify HDMI suspend and resume crash, mute pad sound when insert HDMI.

Browse Source
This commit is contained in:
宋秀杰
2012-11-07 09:11:31 +08:00
parent b236f11e7b
commit a9aa9474fe
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/rt3261.c
View File

@@ -544,6 +544,7 @@ void codec_set_spk(bool on)
if(!codec)
return;
mutex_lock(&codec->mutex);
if(on){
DBG("snd_soc_dapm_enable_pin\n");
snd_soc_dapm_enable_pin(&codec->dapm, "Headphone Jack");
@@ -554,6 +555,7 @@ void codec_set_spk(bool on)
snd_soc_dapm_disable_pin(&codec->dapm, "Ext Spk");
}
snd_soc_dapm_sync(&codec->dapm);
mutex_unlock(&codec->mutex);
}

14
sound/soc/rk29/rk29_rt3261.c
View File

@@ -23,6 +23,7 @@
#include "../codecs/rt3261.h"
#include "rk29_pcm.h"
#include "rk29_i2s.h"
#if 0
#define DBG(x...) printk(KERN_INFO x)
@@ -225,6 +226,19 @@ static int rk29_rt3261_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_enable_pin(dapm, "Headset Jack");
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
#ifdef CONFIG_HDMI
extern int hdmi_is_insert(void);
extern void codec_set_spk(bool on);
if(hdmi_is_insert())
codec_set_spk(false);
#endif
#ifdef CONFIG_HDMI_RK30
extern int hdmi_get_hotplug(void);
if(hdmi_get_hotplug() == 2/*HDMI_HPD_ACTIVED*/)
codec_set_spk(false);
#endif
snd_soc_dapm_sync(dapm);
return 0;