v4l2_err(&(dev)->v4l2_dev, fmt, ##arg)
/*
+ * Unicam must request a minimum of 250Mhz from the VPU clock.
+ * Otherwise the input FIFOs overrun and cause image corruption.
+ */
+#define MIN_VPU_CLOCK_RATE (250 * 1000 * 1000)
+/*
* To protect against a dodgy sensor driver never returning an error from
* enum_mbus_code, set a maximum index value to be used.
*/
void __iomem *base;
/* clock gating base address */
void __iomem *clk_gate_base;
- /* clock handle */
+ /* lp clock handle */
struct clk *clock;
+ /* vpu clock handle */
+ struct clk *vpu_clock;
/* V4l2 device */
struct v4l2_device v4l2_dev;
struct media_device mdev;
unicam_dbg(1, dev, "Running with %u data lanes\n",
dev->active_data_lanes);
- ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
+ ret = clk_set_min_rate(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
+ if (ret) {
+ unicam_err(dev, "failed to set up VPU clock\n");
+ goto err_pm_put;
+ }
+
+ ret = clk_prepare_enable(dev->vpu_clock);
if (ret) {
- unicam_err(dev, "failed to set up clock\n");
+ unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
goto err_pm_put;
}
+ ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
+ if (ret) {
+ unicam_err(dev, "failed to set up CSI clock\n");
+ goto err_vpu_clock;
+ }
+
ret = clk_prepare_enable(dev->clock);
if (ret) {
unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
- goto err_pm_put;
+ goto err_vpu_clock;
}
for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
err_disable_unicam:
unicam_disable(dev);
clk_disable_unprepare(dev->clock);
+err_vpu_clock:
+ ret = clk_set_min_rate(dev->vpu_clock, 0);
+ if (ret)
+ unicam_err(dev, "failed to reset the VPU clock\n");
+ clk_disable_unprepare(dev->vpu_clock);
err_pm_put:
unicam_runtime_put(dev);
err_streaming:
node->streaming = false;
if (node->pad_id == IMAGE_PAD) {
+ int ret;
+
/*
* Stop streaming the sensor and disable the peripheral.
* We cannot continue streaming embedded data with the
unicam_err(dev, "stream off failed in subdev\n");
unicam_disable(dev);
+
+ ret = clk_set_min_rate(dev->vpu_clock, 0);
+ if (ret)
+ unicam_err(dev, "failed to reset the min VPU clock\n");
+
+ clk_disable_unprepare(dev->vpu_clock);
clk_disable_unprepare(dev->clock);
unicam_runtime_put(dev);
unicam->clock = devm_clk_get(&pdev->dev, "lp");
if (IS_ERR(unicam->clock)) {
- unicam_err(unicam, "Failed to get clock\n");
+ unicam_err(unicam, "Failed to get lp clock\n");
ret = PTR_ERR(unicam->clock);
goto err_unicam_put;
}
+ unicam->vpu_clock = devm_clk_get(&pdev->dev, "vpu");
+ if (IS_ERR(unicam->vpu_clock)) {
+ unicam_err(unicam, "Failed to get vpu clock\n");
+ ret = PTR_ERR(unicam->vpu_clock);
+ goto err_unicam_put;
+ }
+
ret = platform_get_irq(pdev, 0);
if (ret <= 0) {
dev_err(&pdev->dev, "No IRQ resource\n");