From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
rajmohan.mani@intel.com, Tomasz Figa <tfiga@chromium.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Bingbu Cao <bingbu.cao@intel.com>,
Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>,
Hyungwoo Yang <hyungwoo.yang@intel.com>,
linux-media@vger.kernel.org
Subject: [PATCH v9 5/7] ov5670: Support probe whilst the device is in a low power state
Date: Fri, 29 Jan 2021 01:27:27 +0200 [thread overview]
Message-ID: <20210128232729.16064-5-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20200903081550.6012-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.
Also do identification on the first access of the device, whether in probe
or when starting streaming.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/ov5670.c | 76 +++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 30 deletions(-)
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 866c8c2e8f59a..eb0d599f3318b 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -1832,6 +1832,8 @@ struct ov5670 {
/* Streaming on/off */
bool streaming;
+ /* True if the device has been identified */
+ bool identified;
};
#define to_ov5670(_sd) container_of(_sd, struct ov5670, sd)
@@ -2271,6 +2273,32 @@ static int ov5670_get_skip_frames(struct v4l2_subdev *sd, u32 *frames)
return 0;
}
+/* Verify chip ID */
+static int ov5670_identify_module(struct ov5670 *ov5670)
+{
+ struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);
+ int ret;
+ u32 val;
+
+ if (ov5670->identified)
+ return 0;
+
+ ret = ov5670_read_reg(ov5670, OV5670_REG_CHIP_ID,
+ OV5670_REG_VALUE_24BIT, &val);
+ if (ret)
+ return ret;
+
+ if (val != OV5670_CHIP_ID) {
+ dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
+ OV5670_CHIP_ID, val);
+ return -ENXIO;
+ }
+
+ ov5670->identified = true;
+
+ return 0;
+}
+
/* Prepare streaming by writing default values and customized values */
static int ov5670_start_streaming(struct ov5670 *ov5670)
{
@@ -2279,6 +2307,10 @@ static int ov5670_start_streaming(struct ov5670 *ov5670)
int link_freq_index;
int ret;
+ ret = ov5670_identify_module(ov5670);
+ if (ret)
+ return ret;
+
/* Get out of from software reset */
ret = ov5670_write_reg(ov5670, OV5670_REG_SOFTWARE_RST,
OV5670_REG_VALUE_08BIT, OV5670_SOFTWARE_RST);
@@ -2400,27 +2432,6 @@ static int __maybe_unused ov5670_resume(struct device *dev)
return 0;
}
-/* Verify chip ID */
-static int ov5670_identify_module(struct ov5670 *ov5670)
-{
- struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);
- int ret;
- u32 val;
-
- ret = ov5670_read_reg(ov5670, OV5670_REG_CHIP_ID,
- OV5670_REG_VALUE_24BIT, &val);
- if (ret)
- return ret;
-
- if (val != OV5670_CHIP_ID) {
- dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
- OV5670_CHIP_ID, val);
- return -ENXIO;
- }
-
- return 0;
-}
-
static const struct v4l2_subdev_video_ops ov5670_video_ops = {
.s_stream = ov5670_set_stream,
};
@@ -2455,6 +2466,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);
@@ -2471,11 +2483,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_state_low_power(&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);
@@ -2512,10 +2527,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);
@@ -2557,7 +2572,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 */ }
};
@@ -2572,6 +2587,7 @@ static struct i2c_driver ov5670_i2c_driver = {
},
.probe_new = ov5670_probe,
.remove = ov5670_remove,
+ .flags = I2C_DRV_FL_ALLOW_LOW_POWER_PROBE,
};
module_i2c_driver(ov5670_i2c_driver);
--
2.20.1
next prev parent reply other threads:[~2021-01-28 23:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:15 [PATCH v8 0/6] Support running driver's probe for a device powered off Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 1/6] i2c: Allow an ACPI driver to manage the device's power state during probe Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 2/6] Documentation: ACPI: Document i2c-allow-low-power-probe _DSD property Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 3/6] ACPI: Add a convenience function to tell a device is in low power state Sakari Ailus
[not found] ` <0c2d4728-6e32-ef93-8961-381fe36cfdaa@linux.intel.com>
2020-09-11 13:01 ` Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 4/6] ov5670: Support probe whilst the device is in a " Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 5/6] media: i2c: imx319: Support probe while the device is off Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 6/6] at24: Support probing while off Sakari Ailus
2020-09-09 9:35 ` Bartosz Golaszewski
2020-09-09 11:11 ` Wolfram Sang
2020-09-09 11:56 ` Bartosz Golaszewski
2020-09-09 12:16 ` Sakari Ailus
2020-09-11 12:11 ` Sakari Ailus
2020-10-06 11:20 ` Tomasz Figa
2020-10-06 11:23 ` Tomasz Figa
2020-09-11 12:49 ` [PATCH v8 0/6] Support running driver's probe for a device powered off Luca Ceresoli
2020-09-11 13:01 ` Sakari Ailus
2020-09-14 7:58 ` Luca Ceresoli
[not found] ` <20200914094727.GM26842@paasikivi.fi.intel.com>
2020-09-14 16:49 ` Luca Ceresoli
2020-09-23 11:08 ` Sakari Ailus
2020-09-23 15:37 ` Luca Ceresoli
2020-09-26 12:38 ` Tomasz Figa
2020-09-27 19:39 ` Wolfram Sang
2020-09-27 19:44 ` Tomasz Figa
2020-09-28 14:17 ` Rafael J. Wysocki
2020-09-28 16:49 ` Tomasz Figa
2020-09-28 20:49 ` Sakari Ailus
2020-09-26 12:46 ` Tomasz Figa
2021-01-28 23:27 ` [PATCH v9 1/7] ACPI: scan: Obtain device's desired enumeration power state Sakari Ailus
[not found] ` <CAJZ5v0hdG1W0D5E6GbrTDiAjMyC0mSgb3Z2WEBy3hhb4iJhDNw@mail.gmail.com>
2021-01-29 16:45 ` Sakari Ailus
2021-01-29 16:57 ` Rafael J. Wysocki
2021-01-29 21:22 ` Sakari Ailus
2021-02-01 11:44 ` Rafael J. Wysocki
2021-01-28 23:27 ` [PATCH v9 2/7] i2c: Allow an ACPI driver to manage the device's power state during probe Sakari Ailus
2021-01-28 23:27 ` [PATCH v9 3/7] Documentation: ACPI: Document _PRE object usage for enum power state Sakari Ailus
2021-01-28 23:27 ` [PATCH v9 4/7] ACPI: Add a convenience function to tell a device is in low " Sakari Ailus
2021-01-28 23:27 ` Sakari Ailus [this message]
2021-01-28 23:27 ` [PATCH v9 6/7] media: i2c: imx319: Support probe while the device is off Sakari Ailus
2021-01-29 2:58 ` Bingbu Cao
2021-01-28 23:27 ` [PATCH v9 7/7] at24: Support probing while off Sakari Ailus
[not found] ` <CAMpxmJVTPgvxOVdTkmt4VjUnGabNBKauKF_DKtnnkV6O0QYTWA@mail.gmail.com>
[not found] ` <20210129121955.GH32460@paasikivi.fi.intel.com>
2021-02-01 8:57 ` Bartosz Golaszewski
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=20210128232729.16064-5-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=bingbu.cao@intel.com \
--cc=chiranjeevi.rapolu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hyungwoo.yang@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rajmohan.mani@intel.com \
--cc=tfiga@chromium.org \
--cc=wsa@the-dreams.de \
/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).