media: i2c: ov5645: 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 always been optional. Both the "clocks" and
"clock-frequency" properties are set in the upstream DT sources. The
driver retrieves the clock, retrieves the clock rate from the
"clock-frequency" property, and sets the clock rate to the retrieved
rate. If the rate does not match the expected rates, the driver fails
probing. 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/ov5645.c b/drivers/media/i2c/ov5645.c
index 70b4cdb1b9af092de11e85df982efb66c1f02382..a383e1a41b1720405e4ac6852768f75bf3fa99c9 100644 (file)
--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -1044,27 +1044,18 @@ static int ov5645_probe(struct i2c_client *client)
                                     "invalid bus type, must be CSI2\n");
 
        /* get system clock (xclk) */
-       ov5645->xclk = devm_v4l2_sensor_clk_get(dev, NULL);
+       ov5645->xclk = devm_v4l2_sensor_clk_get_legacy(dev, NULL, false, 0);
        if (IS_ERR(ov5645->xclk))
                return dev_err_probe(dev, PTR_ERR(ov5645->xclk),
                                     "could not get xclk");
 
-       ret = of_property_read_u32(dev->of_node, "clock-frequency", &xclk_freq);
-       if (ret)
-               return dev_err_probe(dev, ret,
-                                    "could not get xclk frequency\n");
-
        /* external clock must be 24MHz, allow 1% tolerance */
+       xclk_freq = clk_get_rate(ov5645->xclk);
        if (xclk_freq < 23760000 || xclk_freq > 24240000)
                return dev_err_probe(dev, -EINVAL,
                                     "unsupported xclk frequency %u\n",
                                     xclk_freq);
 
-       ret = clk_set_rate(ov5645->xclk, xclk_freq);
-       if (ret)
-               return dev_err_probe(dev, ret,
-                                    "could not set xclk frequency\n");
-
        for (i = 0; i < OV5645_NUM_SUPPLIES; i++)
                ov5645->supplies[i].supply = ov5645_supply_name[i];