openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: atmel-isi: Defer clock (un)preparation to enable/disable time 

The PCLK and MCK clocks are prepared and unprepared at probe and remove
time. Clock (un)preparation isn't needed before enabling/disabling the
clocks, and the enable/disable operation happen in non-atomic context.
We can thus defer (un)preparation to enable/disable time.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart 2013-11-25 12:21:33 -03:00 committed by Mauro Carvalho Chehab
parent c52c0cbfa7
commit c01d568e7f
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/media/platform/soc_camera/atmel-isi.c
View File

@ -721,13 +721,13 @@ static int isi_camera_clock_start(struct soc_camera_host *ici)
struct atmel_isi *isi = ici->priv;
int ret;
ret = clk_enable(isi->pclk);
ret = clk_prepare_enable(isi->pclk);
if (ret)
return ret;
ret = clk_enable(isi->mck);
ret = clk_prepare_enable(isi->mck);
if (ret) {
clk_disable(isi->pclk);
clk_disable_unprepare(isi->pclk);
return ret;
}
@ -739,8 +739,8 @@ static void isi_camera_clock_stop(struct soc_camera_host *ici)
{
struct atmel_isi *isi = ici->priv;
clk_disable(isi->mck);
clk_disable(isi->pclk);
clk_disable_unprepare(isi->mck);
clk_disable_unprepare(isi->pclk);
}
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
@ -869,9 +869,6 @@ static int atmel_isi_remove(struct platform_device *pdev)
isi->p_fb_descriptors,
isi->fb_descriptors_phys);
clk_unprepare(isi->mck);
clk_unprepare(isi->pclk);
return 0;
}
@ -902,10 +899,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
if (IS_ERR(isi->pclk))
return PTR_ERR(isi->pclk);
ret = clk_prepare(isi->pclk);
if (ret)
return ret;
isi->pdata = pdata;
isi->active = NULL;
spin_lock_init(&isi->lock);
@ -916,27 +909,21 @@ static int atmel_isi_probe(struct platform_device *pdev)
isi->mck = devm_clk_get(dev, "isi_mck");
if (IS_ERR(isi->mck)) {
dev_err(dev, "Failed to get isi_mck\n");
ret = PTR_ERR(isi->mck);
goto err_clk_get_mck;
return PTR_ERR(isi->mck);
}
ret = clk_prepare(isi->mck);
if (ret)
goto err_clk_prepare_mck;
/* Set ISI_MCK's frequency, it should be faster than pixel clock */
ret = clk_set_rate(isi->mck, pdata->mck_hz);
if (ret < 0)
goto err_set_mck_rate;
return ret;
isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
sizeof(struct fbd) * MAX_BUFFER_NUM,
&isi->fb_descriptors_phys,
GFP_KERNEL);
if (!isi->p_fb_descriptors) {
ret = -ENOMEM;
dev_err(&pdev->dev, "Can't allocate descriptors!\n");
goto err_alloc_descriptors;
return -ENOMEM;
}
for (i = 0; i < MAX_BUFFER_NUM; i++) {
@ -1002,12 +989,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
sizeof(struct fbd) * MAX_BUFFER_NUM,
isi->p_fb_descriptors,
isi->fb_descriptors_phys);
err_alloc_descriptors:
err_set_mck_rate:
clk_unprepare(isi->mck);
err_clk_prepare_mck:
err_clk_get_mck:
clk_unprepare(isi->pclk);
return ret;
}