github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 15:42:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rk29_phone:1、Changes began to close the codec's strategy to control android 2、Modify i2c stop delay 70us 3、Lower SPK volume to -26DB

Browse Source
This commit is contained in:
邱建斌 2011-07-04 17:47:36 +08:00
parent c03df8e9ca
commit 7ffa5b7ca5
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk29/board-rk29-a22.c
View File

@ -1543,7 +1543,7 @@ struct wm8994_pdata wm8994_platdata = {
.speaker_incall_vol = 0,
.speaker_incall_mic_vol = -9,
.speaker_normal_vol = 6,
.speaker_normal_vol = -26,
.earpiece_incall_vol = 0,
.headset_incall_vol = 6,
.headset_incall_mic_vol = -6,

2
drivers/i2c/busses/i2c-rk29.c
View File

@ -38,7 +38,7 @@
/*max ACK delay time = RK29_I2C_ACK_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_ACK_TIMEOUT_COUNT (100 * 1000)
/*max STOP delay time = RK29_I2C_STOP_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_STOP_TIMEOUT_COUNT 1000
#define RK29_I2C_STOP_TIMEOUT_COUNT 70//1000
/*max START delay time = RK29_I2C_START_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_START_TIMEOUT_COUNT 1000

23
sound/soc/codecs/wm8994.c
View File

@ -148,7 +148,6 @@ struct wm8994_priv {
struct delayed_work wm8994_delayed_work;
int work_type;
char First_Poweron;
unsigned int playback_active:1;
unsigned int capture_active:1;
@ -2695,14 +2694,7 @@ int snd_soc_put_route(struct snd_kcontrol *kcontrol,
char route = kcontrol->private_value & 0xff;
mutex_lock(&wm8994->route_lock);
wm8994->kcontrol = kcontrol;//save rount
if(wm8994->First_Poweron == 1 && route == SPEAKER_NORMAL )
{//First start & Poweron mast disable wm8994
PA_ctrl(GPIO_LOW);
wm8994_write(0,0);
msleep(50);
goto out;
}
//before set the route -- disable PA
switch(route)
{
@ -3044,18 +3036,6 @@ static void wm8994_work_fun(struct work_struct *work)
mutex_unlock(&wm8994->route_lock);
break;
case SNDRV_PCM_TRIGGER_START:
if(wm8994->First_Poweron == 1)
{
DBG("wm8994 First_Poweron shutup\n");
wm8994->First_Poweron = 0;
if(wm8994->kcontrol->private_value != SPEAKER_NORMAL)
{
// DBG("wm8994->kcontrol->private_value != SPEAKER_NORMAL\n");
return;
}
wm8994_current_mode = null;
snd_soc_put_route(wm8994->kcontrol,NULL);
}
break;
case SNDRV_PCM_TRIGGER_RESUME:
msleep(100);
@ -3543,7 +3523,6 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
wm8994->RW_status = TRUE;//add
wm8994->capture_active = 0;
wm8994->playback_active = 0;
wm8994->First_Poweron = 1;
wm8994->call_vol = call_maxvol;
wm8994->BT_call_vol = BT_call_maxvol;
INIT_DELAYED_WORK(&wm8994->wm8994_delayed_work, wm8994_work_fun);