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

media: rk1608: fix power status

Browse Source 
Change-Id: I64055faf7fb8bf748a829b4b6de3ede4b3b8a2c8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2019-08-23 16:11:12 +08:00
committed by Tao Huang
parent 16ee2323d8
commit 6d8ee90e61
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/spi/rk1608.c
View File

@@ -34,6 +34,8 @@ struct rk1608_power_work {
struct completion work_fin;
};
static struct rk1608_power_work gwork;
/**
* Rk1608 is used as the Pre-ISP to link on Soc, which mainly has two
* functions. One is to download the firmware of RK1608, and the other
@@ -905,34 +907,37 @@ int rk1608_set_power(struct rk1608_state *pdata, int on)
static void rk1608_poweron_func(struct work_struct *work)
{
struct rk1608_power_work *pwork = (struct rk1608_power_work *)work;
int ret = rk1608_power_on(pwork->pdata);
rk1608_power_on(pwork->pdata);
complete(&pwork->work_fin);
if (!ret)
complete(&pwork->work_fin);
}
static int rk1608_sensor_power(struct v4l2_subdev *sd, int on)
{
struct rk1608_state *pdata = to_state(sd);
struct rk1608_power_work work;
int ret = 0;
mutex_lock(&pdata->lock);
if (on) {
if (!pdata->power_count) {
INIT_WORK(&work.wk, rk1608_poweron_func);
init_completion(&work.work_fin);
work.pdata = pdata;
schedule_work(&work.wk);
INIT_WORK(&gwork.wk, rk1608_poweron_func);
init_completion(&gwork.work_fin);
gwork.pdata = pdata;
schedule_work(&gwork.wk);
v4l2_subdev_call(pdata->sensor[sd->grp_id],
core, s_power, on);
if (!wait_for_completion_timeout(&work.work_fin,
msecs_to_jiffies(1000)))
if (!wait_for_completion_timeout(&gwork.work_fin,
msecs_to_jiffies(1000))) {
dev_err(pdata->dev,
"wait for preisp power on timeout!");
ret = -EBUSY;
}
}
} else if (!on && pdata->power_count == 1) {
v4l2_subdev_call(pdata->sensor[sd->grp_id], core, s_power, on);
rk1608_power_off(pdata);
ret = rk1608_power_off(pdata);
}
/* Update the power count. */
@@ -940,7 +945,7 @@ static int rk1608_sensor_power(struct v4l2_subdev *sd, int on)
WARN_ON(pdata->power_count < 0);
mutex_unlock(&pdata->lock);
return 0;
return ret;
}
static int rk1608_stream_on(struct rk1608_state *pdata)