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

rk30:sdk:Reduce the delay of the 8326 reset,modify the wakeup order of wm8326 i2c

Browse Source
This commit is contained in:
张晴
2012-04-18 15:51:15 +08:00
parent 46a8d25630
commit 99fc87322e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
View File

@@ -104,7 +104,7 @@ static int wm831x_pre_init(struct wm831x *parm)
//BATT_FET_ENA = 1
wm831x_reg_write(parm, WM831X_SECURITY_KEY, 0x9716); // unlock security key
wm831x_set_bits(parm, WM831X_RESET_CONTROL, 0x1000, 0x1000);
wm831x_set_bits(parm, WM831X_RESET_CONTROL, 0x1003, 0x1001);
ret = wm831x_reg_read(parm, WM831X_RESET_CONTROL) & 0xffff & UNLOCK_SECURITY_KEY; // enternal reset active in sleep
// printk("%s:WM831X_RESET_CONTROL=0x%x\n", __func__, ret);
wm831x_reg_write(parm, WM831X_RESET_CONTROL, ret);

6
drivers/mfd/wm831x-i2c.c
View File

@@ -54,7 +54,7 @@ static int wm831x_i2c_read_device(struct wm831x *wm831x, unsigned short reg,
ret = i2c_transfer(adap, msgs, 2);
return (ret == 2)? count : ret;
return (ret == 2)? 0 : ret;
#else
struct i2c_client *i2c = wm831x->control_data;
int ret;
@@ -177,6 +177,10 @@ static int wm831x_i2c_suspend(struct device *dev)
{
struct wm831x *wm831x = dev_get_drvdata(dev);
spin_lock(&wm831x->flag_lock);
wm831x->flag_suspend = 1;
spin_unlock(&wm831x->flag_lock);
return wm831x_device_suspend(wm831x);
}