AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

media: ov7670: control clock along with power

Browse Source 
This provides more power saving when the sensor is off.

While at that, do the delay on power/clock enable even if the sensor driver
itself doesn't control the GPIOs. This is required for the OLPC XO-1
platform, that lacks the proper power/reset properties in its DT, but
needs the delay after the sensor is clocked up.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Lubomir Rintel 2019-01-15 06:54:46 -02:00 committed by Mauro Carvalho Chehab
parent 3d6a8fe256
commit 030f9f682e
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/media/i2c/ov7670.c
View File

@ -1625,14 +1625,17 @@ static void ov7670_power_on(struct v4l2_subdev *sd)
if (info->on) if (info->on)
return; return;
clk_prepare_enable(info->clk);
if (info->pwdn_gpio) if (info->pwdn_gpio)
gpiod_set_value(info->pwdn_gpio, 0); gpiod_set_value(info->pwdn_gpio, 0);
if (info->resetb_gpio) { if (info->resetb_gpio) {
gpiod_set_value(info->resetb_gpio, 1); gpiod_set_value(info->resetb_gpio, 1);
usleep_range(500, 1000); usleep_range(500, 1000);
gpiod_set_value(info->resetb_gpio, 0); gpiod_set_value(info->resetb_gpio, 0);
usleep_range(3000, 5000);
} }
if (info->pwdn_gpio || info->resetb_gpio || info->clk)
usleep_range(3000, 5000);
info->on = true; info->on = true;
} }
@ -1644,6 +1647,8 @@ static void ov7670_power_off(struct v4l2_subdev *sd)
if (!info->on) if (!info->on)
return; return;
clk_disable_unprepare(info->clk);
if (info->pwdn_gpio) if (info->pwdn_gpio)
gpiod_set_value(info->pwdn_gpio, 1); gpiod_set_value(info->pwdn_gpio, 1);
@ -1864,24 +1869,20 @@ static int ov7670_probe(struct i2c_client *client,
return ret; return ret;
} }
if (info->clk) { ret = ov7670_init_gpio(client, info);
ret = clk_prepare_enable(info->clk); if (ret)
if (ret) return ret;
return ret;
ov7670_power_on(sd);
if (info->clk) {
info->clock_speed = clk_get_rate(info->clk) / 1000000; info->clock_speed = clk_get_rate(info->clk) / 1000000;
if (info->clock_speed < 10 || info->clock_speed > 48) { if (info->clock_speed < 10 || info->clock_speed > 48) {
ret = -EINVAL; ret = -EINVAL;
goto clk_disable; goto power_off;
} }
} }
ret = ov7670_init_gpio(client, info);
if (ret)
goto clk_disable;
ov7670_power_on(sd);
/* Make sure it's an ov7670 */ /* Make sure it's an ov7670 */
ret = ov7670_detect(sd); ret = ov7670_detect(sd);
if (ret) { if (ret) {
@ -1961,6 +1962,7 @@ static int ov7670_probe(struct i2c_client *client,
if (ret < 0) if (ret < 0)
goto entity_cleanup; goto entity_cleanup;
ov7670_power_off(sd);
return 0; return 0;
entity_cleanup: entity_cleanup:
@ -1969,12 +1971,9 @@ static int ov7670_probe(struct i2c_client *client,
v4l2_ctrl_handler_free(&info->hdl); v4l2_ctrl_handler_free(&info->hdl);
power_off: power_off:
ov7670_power_off(sd); ov7670_power_off(sd);
clk_disable:
clk_disable_unprepare(info->clk);
return ret; return ret;
} }
static int ov7670_remove(struct i2c_client *client) static int ov7670_remove(struct i2c_client *client)
{ {
struct v4l2_subdev *sd = i2c_get_clientdata(client); struct v4l2_subdev *sd = i2c_get_clientdata(client);
@ -1982,7 +1981,6 @@ static int ov7670_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(sd); v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(&info->hdl); v4l2_ctrl_handler_free(&info->hdl);
clk_disable_unprepare(info->clk);
media_entity_cleanup(&info->sd.entity); media_entity_cleanup(&info->sd.entity);
ov7670_power_off(sd); ov7670_power_off(sd);
return 0; return 0;