media: i2c: ov5695: Use V4L2 legacy sensor clock helper

Several camera sensor drivers access the "clock-frequency" property
directly to retrieve the external clock rate, or modify the clock rate
of the external clock programmatically. Both behaviours are valid on a
subset of ACPI platforms, but are considered deprecated on OF platforms,
and do not support ACPI platforms that implement MIPI DisCo for Imaging.
Implementing them manually in drivers is deprecated, as that can
encourage copying deprecated behaviour for OF platforms in new drivers,
and lead to differences in behaviour between drivers. Instead, drivers
that need to preserve the deprecated OF behaviour should use the
devm_v4l2_sensor_clk_get_legacy() helper.

This driver supports OF platforms only. The "clocks" property has always
been specified as mandatory in the DT bindings and the "clock-frequency"
property has never been allowed. The "clocks" property is set in the
upstream DT sources and the "clock-frequency" property isn't. The driver
retrieves the clock and sets its rate to a fixed value. It then
retrieves the rate from the clock, and fails probing if the value
doesn't match. This is deprecated behaviour for OF.

Switch to using the devm_v4l2_sensor_clk_get_legacy() helper. This
preserves setting the clock rate on OF platforms. Should support for OF
platforms that set the clock rate through clock-frequency be considered
unneeded in the future, the driver will only need to switch to
devm_v4l2_sensor_clk_get() without any other change.

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

diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
index fe7ad7b2c05a32631aaa7c13d2431d8d925b3b58..5bb6ce7b32375faf11f02e44b5dc3230d2fc1525 100644 (file)
--- a/drivers/media/i2c/ov5695.c
+++ b/drivers/media/i2c/ov5695.c
@@ -1264,16 +1264,12 @@ static int ov5695_probe(struct i2c_client *client)
        ov5695->client = client;
        ov5695->cur_mode = &supported_modes[0];
 
-       ov5695->xvclk = devm_v4l2_sensor_clk_get(dev, "xvclk");
+       ov5695->xvclk = devm_v4l2_sensor_clk_get_legacy(dev, "xvclk", true,
+                                                       OV5695_XVCLK_FREQ);
        if (IS_ERR(ov5695->xvclk))
                return dev_err_probe(dev, PTR_ERR(ov5695->xvclk),
                                     "Failed to get xvclk\n");
 
-       ret = clk_set_rate(ov5695->xvclk, OV5695_XVCLK_FREQ);
-       if (ret < 0) {
-               dev_err(dev, "Failed to set xvclk rate (24MHz)\n");
-               return ret;
-       }
        if (clk_get_rate(ov5695->xvclk) != OV5695_XVCLK_FREQ)
                dev_warn(dev, "xvclk mismatched, modes are based on 24MHz\n");