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

mfd: rk808: modify the sequence of the sleep pin function and polarity

Browse Source 
The sequence of operations is as follows:
1. disable the sleep pin function
2. modify the sleep pin polarity
3. delay 3 32k clock cycle
4. select the sleep pin function

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: If6df2b2f190951abe9bb31fbd18d9af47e145038
This commit is contained in:
shengfei Xu
2020-06-21 11:33:05 +08:00
committed by Tao Huang
parent 26de57fe61
commit ceffd1ad98
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/mfd/rk808.c
View File

@@ -1310,6 +1310,19 @@ static int rk808_probe(struct i2c_client *client,
if (of_property_prepare_fn)
of_property_prepare_fn(rk808, &client->dev);
for (i = 0; i < nr_pre_init_regs; i++) {
ret = regmap_update_bits(rk808->regmap,
pre_init_reg[i].addr,
pre_init_reg[i].mask,
pre_init_reg[i].value);
if (ret) {
dev_err(&client->dev,
"0x%x write err\n",
pre_init_reg[i].addr);
return ret;
}
}
if (pinctrl_init) {
ret = pinctrl_init(&client->dev, rk808);
if (ret)
@@ -1337,18 +1350,6 @@ static int rk808_probe(struct i2c_client *client,
}
}
for (i = 0; i < nr_pre_init_regs; i++) {
ret = regmap_update_bits(rk808->regmap,
pre_init_reg[i].addr,
pre_init_reg[i].mask,
pre_init_reg[i].value);
if (ret) {
dev_err(&client->dev,
"0x%x write err\n",
pre_init_reg[i].addr);
return ret;
}
}
ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
cells, nr_cells, NULL, 0,
@@ -1420,6 +1421,8 @@ static int rk808_remove(struct i2c_client *client)
static int __maybe_unused rk8xx_suspend(struct device *dev)
{
int i, ret = 0;
int value;
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
for (i = 0; i < suspend_reg_num; i++) {
@@ -1452,8 +1455,10 @@ static int __maybe_unused rk8xx_suspend(struct device *dev)
dev_err(dev, "suspend: config RK817_SLPPOL_H error!\n");
return ret;
}
udelay(100);
/* pmic need the SCL clock to synchronize register */
regmap_read(rk808->regmap, RK817_SYS_STS, &value);
mdelay(2);
ret = pinctrl_select_state(rk808->pins->p, rk808->pins->sleep);
if (ret) {
dev_err(dev, "failed to act slp pinctrl state\n");
@@ -1466,6 +1471,7 @@ static int __maybe_unused rk8xx_suspend(struct device *dev)
static int __maybe_unused rk8xx_resume(struct device *dev)
{
int i, ret = 0;
int value;
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
for (i = 0; i < resume_reg_num; i++) {
@@ -1497,8 +1503,10 @@ static int __maybe_unused rk8xx_resume(struct device *dev)
dev_err(dev, "resume: config RK817_SLPPOL_L error!\n");
return ret;
}
udelay(100);
/* pmic need the SCL clock to synchronize register */
regmap_read(rk808->regmap, RK817_SYS_STS, &value);
mdelay(2);
ret = pinctrl_select_state(rk808->pins->p, rk808->pins->reset);
if (ret)
dev_dbg(dev, "failed to act reset pinctrl state\n");