* Re: [PATCH] media:davinci: clk - {prepare/unprepare} for common clk framework
2012-10-20 6:39 ` [PATCH] media:davinci: clk - {prepare/unprepare} for common clk framework Prabhakar Lad
@ 2012-10-22 15:16 ` Murali Karicheri
0 siblings, 0 replies; 2+ messages in thread
From: Murali Karicheri @ 2012-10-22 15:16 UTC (permalink / raw)
To: Prabhakar Lad
Cc: mchehab, laurent.pinchart, manjunath.hadli, linux-media,
linux-kernel, davinci-linux-open-source
On 10/20/2012 02:39 AM, Prabhakar Lad wrote:
> Hi Murali,
>
> On Friday 19 October 2012 11:42 PM, Murali Karicheri wrote:
>> 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>
>> ---
>> drivers/media/video/davinci/dm355_ccdc.c | 8 ++++++--
>> drivers/media/video/davinci/dm644x_ccdc.c | 16 ++++++++++------
>> drivers/media/video/davinci/isif.c | 5 ++++-
>> drivers/media/video/davinci/vpbe.c | 10 +++++++---
>> drivers/media/video/davinci/vpif.c | 8 ++++----
>> 5 files changed, 31 insertions(+), 16 deletions(-)
>>
> Thanks for the patch. Can you rebase this patch on 3.7, Since
> the folder structure for media drivers has been reorganised.
> And for some reason this patch hasn't reached any mailing list.
>
> Thanks And Regards,
> --Prabhakar Lad
Prabakhar,
I have re-sent the patches rebased to 3.7rc1. You are right, at times my
patches don't show up on the mailing list. I am not sure why. It is not
that none of them reaches the list, but some do make it. Do you have any
suggestion why this could be happening? I will check with our IT first
to see if emails are getting blocked at TI server for some reason.
Meanwhile, could you test these patches with video drivers and request a
merge to 3.7rcx? The patches are available at
https://gitorious.org/~m-karicheri/linux-davinci/linux-davinci-clk/commits/video-clk-patches-v3.7rc1
https://gitorious.org/~m-karicheri/linux-davinci/linux-davinci-clk/commit/539b2de5913000cbf6f594e63b680673368dd9a2
Murali
>> diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
>> index 5b68847..af88cce 100644
>> --- a/drivers/media/video/davinci/dm355_ccdc.c
>> +++ b/drivers/media/video/davinci/dm355_ccdc.c
>> @@ -1003,7 +1003,7 @@ static int __init 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;
>> }
>> @@ -1014,7 +1014,7 @@ static int __init 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;
>> }
>> @@ -1034,8 +1034,10 @@ static int __init 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);
>> @@ -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);
>> diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
>> index 9303fe5..24388fa 100644
>> --- a/drivers/media/video/davinci/dm644x_ccdc.c
>> +++ b/drivers/media/video/davinci/dm644x_ccdc.c
>> @@ -994,7 +994,7 @@ static int __init 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;
>> }
>> @@ -1005,7 +1005,7 @@ static int __init 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;
>> }
>> @@ -1013,8 +1013,10 @@ static int __init dm644x_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);
>> @@ -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);
>> @@ -1046,8 +1050,8 @@ 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;
>> }
>> @@ -1055,8 +1059,8 @@ static int dm644x_ccdc_suspend(struct device *dev)
>> 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();
>>
>> diff --git a/drivers/media/video/davinci/isif.c b/drivers/media/video/davinci/isif.c
>> index 5278fe7..d9c3116 100644
>> --- a/drivers/media/video/davinci/isif.c
>> +++ b/drivers/media/video/davinci/isif.c
>> @@ -1053,7 +1053,7 @@ static int __init 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;
>> }
>> @@ -1125,6 +1125,7 @@ fail_nobase_res:
>> i--;
>> }
>> fail_mclk:
>> + clk_disable_unprepare(isif_cfg.mclk);
>> clk_put(isif_cfg.mclk);
>> vpfe_unregister_ccdc_device(&isif_hw_dev);
>> return status;
>> @@ -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;
>> }
>>
>> diff --git a/drivers/media/video/davinci/vpbe.c b/drivers/media/video/davinci/vpbe.c
>> index c4a82a1..7cfbc1e 100644
>> --- a/drivers/media/video/davinci/vpbe.c
>> +++ b/drivers/media/video/davinci/vpbe.c
>> @@ -628,7 +628,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
>> ret = PTR_ERR(vpbe_dev->dac_clk);
>> goto vpbe_unlock;
>> }
>> - if (clk_enable(vpbe_dev->dac_clk)) {
>> + if (clk_prepare_enable(vpbe_dev->dac_clk)) {
>> ret = -ENODEV;
>> goto vpbe_unlock;
>> }
>> @@ -777,8 +777,10 @@ vpbe_fail_sd_register:
>> vpbe_fail_v4l2_device:
>> v4l2_device_unregister(&vpbe_dev->v4l2_dev);
>> vpbe_fail_clock:
>> - 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);
>> + }
>> vpbe_unlock:
>> mutex_unlock(&vpbe_dev->lock);
>> return ret;
>> @@ -795,8 +797,10 @@ vpbe_unlock:
>> 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);
>> diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
>> index b3637af..2857ced 100644
>> --- a/drivers/media/video/davinci/vpif.c
>> +++ b/drivers/media/video/davinci/vpif.c
>> @@ -442,7 +442,7 @@ static int __init 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");
>> @@ -458,7 +458,7 @@ fail:
>> 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);
>> }
>>
>> @@ -470,13 +470,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;
>> }
>>
>>
>
^ permalink raw reply [flat|nested] 2+ messages in thread