From: Rajmohan Mani <rajmohan.m...@intel.com>

Tell ACPI device PM code that the driver supports the device being powered
off when the driver's probe function is entered.

Signed-off-by: Rajmohan Mani <rajmohan.m...@intel.com>
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
---
 drivers/media/i2c/imx319.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/media/i2c/imx319.c b/drivers/media/i2c/imx319.c
index 17c2e4b41221e..e929de86a8e22 100644
--- a/drivers/media/i2c/imx319.c
+++ b/drivers/media/i2c/imx319.c
@@ -2424,6 +2424,7 @@ static struct imx319_hwcfg *imx319_get_hwcfg(struct 
device *dev)
 static int imx319_probe(struct i2c_client *client)
 {
        struct imx319 *imx319;
+       bool powered_off;
        int ret;
        u32 i;
 
@@ -2436,11 +2437,14 @@ static int imx319_probe(struct i2c_client *client)
        /* Initialize subdev */
        v4l2_i2c_subdev_init(&imx319->sd, client, &imx319_subdev_ops);
 
-       /* Check module identity */
-       ret = imx319_identify_module(imx319);
-       if (ret) {
-               dev_err(&client->dev, "failed to find sensor: %d", ret);
-               goto error_probe;
+       powered_off = acpi_dev_powered_off_for_probe(&client->dev);
+       if (!powered_off) {
+               /* Check module identity */
+               ret = imx319_identify_module(imx319);
+               if (ret) {
+                       dev_err(&client->dev, "failed to find sensor: %d", ret);
+                       goto error_probe;
+               }
        }
 
        imx319->hwcfg = imx319_get_hwcfg(&client->dev);
@@ -2492,11 +2496,9 @@ static int imx319_probe(struct i2c_client *client)
        if (ret < 0)
                goto error_media_entity;
 
-       /*
-        * Device is already turned on by i2c-core with ACPI domain PM.
-        * Enable runtime PM and turn off the device.
-        */
-       pm_runtime_set_active(&client->dev);
+       /* Don't set the device's state to active if it's powered off. */
+       if (!powered_off)
+               pm_runtime_set_active(&client->dev);
        pm_runtime_enable(&client->dev);
        pm_runtime_idle(&client->dev);
 
@@ -2536,7 +2538,7 @@ static const struct dev_pm_ops imx319_pm_ops = {
 };
 
 static const struct acpi_device_id imx319_acpi_ids[] = {
-       { "SONY319A" },
+       { "SONY319A", },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(acpi, imx319_acpi_ids);
@@ -2544,6 +2546,7 @@ MODULE_DEVICE_TABLE(acpi, imx319_acpi_ids);
 static struct i2c_driver imx319_i2c_driver = {
        .driver = {
                .name = "imx319",
+               .probe_powered_off = true,
                .pm = &imx319_pm_ops,
                .acpi_match_table = ACPI_PTR(imx319_acpi_ids),
        },
-- 
2.11.0

Reply via email to