You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
6 years ago
|
From 185076ab6bc5dd83f2da62552fbb79a53d36314d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
Date: Tue, 18 Sep 2018 11:08:51 +0100
|
||
|
|
Subject: [PATCH 419/454] media: ov5647: Use gpiod_set_value_cansleep
|
||
|
|
|
||
|
|
All calls to the gpio library are in contexts that can sleep,
|
||
|
|
therefore there is no issue with having those GPIOs controlled
|
||
|
|
by controllers which require sleeping (eg I2C GPIO expanders).
|
||
|
|
|
||
|
|
Switch to using gpiod_set_value_cansleep instead of gpiod_set_value
|
||
|
|
to avoid triggering the warning in gpiolib should the GPIO
|
||
|
|
controller need to sleep.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
---
|
||
|
|
drivers/media/i2c/ov5647.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/ov5647.c
|
||
|
|
+++ b/drivers/media/i2c/ov5647.c
|
||
|
|
@@ -348,7 +348,7 @@ static int ov5647_sensor_power(struct v4
|
||
|
|
dev_dbg(&client->dev, "OV5647 power on\n");
|
||
|
|
|
||
|
|
if (ov5647->pwdn) {
|
||
|
|
- gpiod_set_value(ov5647->pwdn, 0);
|
||
|
|
+ gpiod_set_value_cansleep(ov5647->pwdn, 0);
|
||
|
|
msleep(PWDN_ACTIVE_DELAY_MS);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -390,7 +390,7 @@ static int ov5647_sensor_power(struct v4
|
||
|
|
|
||
|
|
clk_disable_unprepare(ov5647->xclk);
|
||
|
|
|
||
|
|
- gpiod_set_value(ov5647->pwdn, 1);
|
||
|
|
+ gpiod_set_value_cansleep(ov5647->pwdn, 1);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Update the power count. */
|
||
|
|
@@ -624,13 +624,13 @@ static int ov5647_probe(struct i2c_clien
|
||
|
|
goto mutex_remove;
|
||
|
|
|
||
|
|
if (sensor->pwdn) {
|
||
|
|
- gpiod_set_value(sensor->pwdn, 0);
|
||
|
|
+ gpiod_set_value_cansleep(sensor->pwdn, 0);
|
||
|
|
msleep(PWDN_ACTIVE_DELAY_MS);
|
||
|
|
}
|
||
|
|
|
||
|
|
ret = ov5647_detect(sd);
|
||
|
|
|
||
|
|
- gpiod_set_value(sensor->pwdn, 1);
|
||
|
|
+ gpiod_set_value_cansleep(sensor->pwdn, 1);
|
||
|
|
|
||
|
|
if (ret < 0)
|
||
|
|
goto error;
|