From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v2 3/5] ov5670: Support probe whilst the device is in a low power state
Date: Mon, 26 Aug 2019 11:31:10 +0300 [thread overview]
Message-ID: <20190826083112.8888-4-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190826083112.8888-1-sakari.ailus@linux.intel.com>
Tell ACPI device PM code that the driver supports the device being in a
low power state when the driver's probe function is entered.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/ov5670.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 041fcbb4eebdf..760fce93337cd 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -2444,6 +2444,7 @@ static int ov5670_probe(struct i2c_client *client)
struct ov5670 *ov5670;
const char *err_msg;
u32 input_clk = 0;
+ bool low_power;
int ret;
device_property_read_u32(&client->dev, "clock-frequency", &input_clk);
@@ -2460,11 +2461,14 @@ static int ov5670_probe(struct i2c_client *client)
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov5670->sd, client, &ov5670_subdev_ops);
- /* Check module identity */
- ret = ov5670_identify_module(ov5670);
- if (ret) {
- err_msg = "ov5670_identify_module() error";
- goto error_print;
+ low_power = acpi_dev_low_power_state_probe(&client->dev);
+ if (!low_power) {
+ /* Check module identity */
+ ret = ov5670_identify_module(ov5670);
+ if (ret) {
+ err_msg = "ov5670_identify_module() error";
+ goto error_print;
+ }
}
mutex_init(&ov5670->mutex);
@@ -2501,10 +2505,10 @@ static int ov5670_probe(struct i2c_client *client)
ov5670->streaming = false;
/*
- * Device is already turned on by i2c-core with ACPI domain PM.
- * Enable runtime PM and turn off the device.
+ * Don't set the device's state to active if it's in a low power state.
*/
- pm_runtime_set_active(&client->dev);
+ if (!low_power)
+ pm_runtime_set_active(&client->dev);
pm_runtime_enable(&client->dev);
pm_runtime_idle(&client->dev);
@@ -2546,7 +2550,7 @@ static const struct dev_pm_ops ov5670_pm_ops = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id ov5670_acpi_ids[] = {
- {"INT3479"},
+ { "INT3479" },
{ /* sentinel */ }
};
@@ -2556,6 +2560,7 @@ MODULE_DEVICE_TABLE(acpi, ov5670_acpi_ids);
static struct i2c_driver ov5670_i2c_driver = {
.driver = {
.name = "ov5670",
+ .probe_low_power = true,
.pm = &ov5670_pm_ops,
.acpi_match_table = ACPI_PTR(ov5670_acpi_ids),
},
--
2.20.1
next prev parent reply other threads:[~2019-08-26 8:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 8:31 [PATCH v2 0/5] Support running driver's probe for a device powered off Sakari Ailus
2019-08-26 8:31 ` [PATCH v2 1/5] ACPI: Enable driver and firmware hints to control power at probe time Sakari Ailus
2019-08-26 8:43 ` Greg Kroah-Hartman
2019-08-26 10:32 ` Sakari Ailus
2019-08-26 13:34 ` Greg Kroah-Hartman
2019-08-26 13:51 ` Sakari Ailus
2019-08-28 8:55 ` Rafael J. Wysocki
2019-08-28 9:57 ` Sakari Ailus
2019-08-28 12:35 ` Rafael J. Wysocki
2019-08-26 8:46 ` Greg Kroah-Hartman
2019-08-26 10:29 ` Sakari Ailus
2019-08-26 8:31 ` [PATCH v2 2/5] ACPI: Add a convenience function to tell a device is suspended in probe Sakari Ailus
2019-08-26 8:31 ` Sakari Ailus [this message]
2019-08-26 8:31 ` [PATCH v2 4/5] media: i2c: imx319: Support probe while the device is off Sakari Ailus
2019-08-26 8:31 ` [PATCH v2 5/5] at24: Support probing while off Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190826083112.8888-4-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).