From f3c733a3f297d30427b59a85e7053024b15b10a7 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 2 Apr 2014 21:50:49 +0800 Subject: [PATCH] rk3288:enable front camera --- drivers/media/video/rk_camsys/camsys_marvin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c index 041a3a562d60..486b2ffbd6b2 100755 --- a/drivers/media/video/rk_camsys/camsys_marvin.c +++ b/drivers/media/video/rk_camsys/camsys_marvin.c @@ -135,6 +135,9 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on) clk_prepare_enable(clk->isp); clk_prepare_enable(clk->isp_jpe); clk_prepare_enable(clk->clk_mipi_24m); + clk_prepare_enable(clk->pclkin_isp); + + // clk_enable(clk->pd_isp); // clk_enable(clk->aclk_isp); @@ -156,6 +159,7 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on) clk_disable_unprepare(clk->isp); clk_disable_unprepare(clk->isp_jpe); clk_disable_unprepare(clk->clk_mipi_24m); + clk_disable_unprepare(clk->pclkin_isp); // clk_disable(clk->pd_isp); // clk_disable(clk->aclk_isp); @@ -346,7 +350,7 @@ int camsys_mrv_probe_cb(struct platform_device *pdev, camsys_dev_t *camsys_dev) mrv_clk->cif_clk_out = devm_clk_get(&pdev->dev, "clk_vipout"); mrv_clk->clk_mipi_24m = devm_clk_get(&pdev->dev,"clk_mipi_24m"); if (/*IS_ERR_OR_NULL(mrv_clk->pd_isp) ||*/ IS_ERR_OR_NULL(mrv_clk->aclk_isp) || IS_ERR_OR_NULL(mrv_clk->hclk_isp) || - IS_ERR_OR_NULL(mrv_clk->isp) || IS_ERR_OR_NULL(mrv_clk->isp_jpe) /*|| IS_ERR_OR_NULL(mrv_clk->pclkin_isp)*/ || + IS_ERR_OR_NULL(mrv_clk->isp) || IS_ERR_OR_NULL(mrv_clk->isp_jpe) || IS_ERR_OR_NULL(mrv_clk->pclkin_isp) || IS_ERR_OR_NULL(mrv_clk->cif_clk_out) || IS_ERR_OR_NULL(mrv_clk->clk_mipi_24m)) { camsys_err("Get %s clock resouce failed!\n",miscdev_name); err = -EINVAL; -- 2.34.1