media: i2c: ov2685: Use the v4l2 helper for obtaining the clock

devm_clk_get() fails on ACPI-based platforms, where firmware does not
provide a direct reference to the clock producer.

Replace devm_clk_get() with the new v4l2 helper
devm_v4l2_sensor_clk_get() that works on both DT- and ACPI-based
platforms to retrieve a reference to the clock producer from firmware.

Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
index 9b8481b8dcd4c146ae8fad626e48f006490f5ef1..c435799514b95824a3fcf8b7e70877b669852add 100644 (file)
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -783,11 +783,11 @@ static int ov2685_probe(struct i2c_client *client)
        ov2685->client = client;
        ov2685->cur_mode = &supported_modes[0];
 
-       ov2685->xvclk = devm_clk_get(dev, "xvclk");
-       if (IS_ERR(ov2685->xvclk)) {
-               dev_err(dev, "Failed to get xvclk\n");
-               return -EINVAL;
-       }
+       ov2685->xvclk = devm_v4l2_sensor_clk_get(dev, "xvclk");
+       if (IS_ERR(ov2685->xvclk))
+               return dev_err_probe(dev, PTR_ERR(ov2685->xvclk),
+                                    "Failed to get xvclk\n");
+
        ret = clk_set_rate(ov2685->xvclk, OV2685_XVCLK_FREQ);
        if (ret < 0) {
                dev_err(dev, "Failed to set xvclk rate (24MHz)\n");