Skip to content

Commit

Permalink
[media] media:davinci: clk - {prepare/unprepare} for common clk
Browse files Browse the repository at this point in the history 
As a first step towards migrating davinci platforms to use common clock
framework, replace all instances of clk_enable() with clk_prepare_enable()
and clk_disable() with clk_disable_unprepare().
Also fixes some issues related to clk clean up in the driver

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Murali Karicheri authored and Mauro Carvalho Chehab committed Nov 21, 2012
1 parent d046628 commit 1f5a5e6
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 16 deletions.
8 changes: 6 additions & 2 deletions drivers/media/platform/davinci/dm355_ccdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
status = PTR_ERR(ccdc_cfg.mclk);
goto fail_nomap;
}
if (clk_enable(ccdc_cfg.mclk)) {
if (clk_prepare_enable(ccdc_cfg.mclk)) {
status = -ENODEV;
goto fail_mclk;
}
Expand All @@ -1014,7 +1014,7 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
status = PTR_ERR(ccdc_cfg.sclk);
goto fail_mclk;
}
if (clk_enable(ccdc_cfg.sclk)) {
if (clk_prepare_enable(ccdc_cfg.sclk)) {
status = -ENODEV;
goto fail_sclk;
}
Expand All @@ -1034,8 +1034,10 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);
return 0;
fail_sclk:
clk_disable_unprepare(ccdc_cfg.sclk);
clk_put(ccdc_cfg.sclk);
fail_mclk:
clk_disable_unprepare(ccdc_cfg.mclk);
clk_put(ccdc_cfg.mclk);
fail_nomap:
iounmap(ccdc_cfg.base_addr);
Expand All @@ -1050,6 +1052,8 @@ static int dm355_ccdc_remove(struct platform_device *pdev)
{
struct resource *res;

clk_disable_unprepare(ccdc_cfg.sclk);
clk_disable_unprepare(ccdc_cfg.mclk);
clk_put(ccdc_cfg.mclk);
clk_put(ccdc_cfg.sclk);
iounmap(ccdc_cfg.base_addr);
Expand Down
16 changes: 10 additions & 6 deletions drivers/media/platform/davinci/dm644x_ccdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ static int __devinit dm644x_ccdc_probe(struct platform_device *pdev)
status = PTR_ERR(ccdc_cfg.mclk);
goto fail_nomap;
}
if (clk_enable(ccdc_cfg.mclk)) {
if (clk_prepare_enable(ccdc_cfg.mclk)) {
status = -ENODEV;
goto fail_mclk;
}
Expand All @@ -1005,16 +1005,18 @@ static int __devinit dm644x_ccdc_probe(struct platform_device *pdev)
status = PTR_ERR(ccdc_cfg.sclk);
goto fail_mclk;
}
if (clk_enable(ccdc_cfg.sclk)) {
if (clk_prepare_enable(ccdc_cfg.sclk)) {
status = -ENODEV;
goto fail_sclk;
}
ccdc_cfg.dev = &pdev->dev;
printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);
return 0;
fail_sclk:
clk_disable_unprepare(ccdc_cfg.sclk);
clk_put(ccdc_cfg.sclk);
fail_mclk:
clk_disable_unprepare(ccdc_cfg.mclk);
clk_put(ccdc_cfg.mclk);
fail_nomap:
iounmap(ccdc_cfg.base_addr);
Expand All @@ -1029,6 +1031,8 @@ static int dm644x_ccdc_remove(struct platform_device *pdev)
{
struct resource *res;

clk_disable_unprepare(ccdc_cfg.mclk);
clk_disable_unprepare(ccdc_cfg.sclk);
clk_put(ccdc_cfg.mclk);
clk_put(ccdc_cfg.sclk);
iounmap(ccdc_cfg.base_addr);
Expand All @@ -1046,17 +1050,17 @@ static int dm644x_ccdc_suspend(struct device *dev)
/* Disable CCDC */
ccdc_enable(0);
/* Disable both master and slave clock */
clk_disable(ccdc_cfg.mclk);
clk_disable(ccdc_cfg.sclk);
clk_disable_unprepare(ccdc_cfg.mclk);
clk_disable_unprepare(ccdc_cfg.sclk);

return 0;
}

static int dm644x_ccdc_resume(struct device *dev)
{
/* Enable both master and slave clock */
clk_enable(ccdc_cfg.mclk);
clk_enable(ccdc_cfg.sclk);
clk_prepare_enable(ccdc_cfg.mclk);
clk_prepare_enable(ccdc_cfg.sclk);
/* Restore CCDC context */
ccdc_restore_context();

Expand Down
5 changes: 4 additions & 1 deletion drivers/media/platform/davinci/isif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ static int __devinit isif_probe(struct platform_device *pdev)
status = PTR_ERR(isif_cfg.mclk);
goto fail_mclk;
}
if (clk_enable(isif_cfg.mclk)) {
if (clk_prepare_enable(isif_cfg.mclk)) {
status = -ENODEV;
goto fail_mclk;
}
Expand Down Expand Up @@ -1125,6 +1125,7 @@ static int __devinit isif_probe(struct platform_device *pdev)
i--;
}
fail_mclk:
clk_disable_unprepare(isif_cfg.mclk);
clk_put(isif_cfg.mclk);
vpfe_unregister_ccdc_device(&isif_hw_dev);
return status;
Expand All @@ -1145,6 +1146,8 @@ static int isif_remove(struct platform_device *pdev)
i++;
}
vpfe_unregister_ccdc_device(&isif_hw_dev);
clk_disable_unprepare(isif_cfg.mclk);
clk_put(isif_cfg.mclk);
return 0;
}

Expand Down
10 changes: 7 additions & 3 deletions drivers/media/platform/davinci/vpbe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
ret = PTR_ERR(vpbe_dev->dac_clk);
goto fail_mutex_unlock;
}
if (clk_enable(vpbe_dev->dac_clk)) {
if (clk_prepare_enable(vpbe_dev->dac_clk)) {
ret = -ENODEV;
goto fail_mutex_unlock;
}
Expand Down Expand Up @@ -759,8 +759,10 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
fail_dev_unregister:
v4l2_device_unregister(&vpbe_dev->v4l2_dev);
fail_clk_put:
if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0)
if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0) {
clk_disable_unprepare(vpbe_dev->dac_clk);
clk_put(vpbe_dev->dac_clk);
}
fail_mutex_unlock:
mutex_unlock(&vpbe_dev->lock);
return ret;
Expand All @@ -777,8 +779,10 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
static void vpbe_deinitialize(struct device *dev, struct vpbe_device *vpbe_dev)
{
v4l2_device_unregister(&vpbe_dev->v4l2_dev);
if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0)
if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0) {
clk_disable_unprepare(vpbe_dev->dac_clk);
clk_put(vpbe_dev->dac_clk);
}

kfree(vpbe_dev->amp);
kfree(vpbe_dev->encoders);
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/platform/davinci/vpif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ static int __devinit vpif_probe(struct platform_device *pdev)
status = PTR_ERR(vpif_clk);
goto clk_fail;
}
clk_enable(vpif_clk);
clk_prepare_enable(vpif_clk);

spin_lock_init(&vpif_lock);
dev_info(&pdev->dev, "vpif probe success\n");
Expand All @@ -460,7 +460,7 @@ static int __devinit vpif_probe(struct platform_device *pdev)
static int __devexit vpif_remove(struct platform_device *pdev)
{
if (vpif_clk) {
clk_disable(vpif_clk);
clk_disable_unprepare(vpif_clk);
clk_put(vpif_clk);
}

Expand All @@ -472,13 +472,13 @@ static int __devexit vpif_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int vpif_suspend(struct device *dev)
{
clk_disable(vpif_clk);
clk_disable_unprepare(vpif_clk);
return 0;
}

static int vpif_resume(struct device *dev)
{
clk_enable(vpif_clk);
clk_prepare_enable(vpif_clk);
return 0;
}

Expand Down

0 comments on commit 1f5a5e6

Please sign in to comment.