>> -----Original Message-----
>> From: Karicheri, Muralidharan
>> Sent: Monday, September 17, 2012 12:38 PM
>> To: dw...@infradead.org; artem.bityuts...@linux.intel.com; h...@denx.de;
>> miked...@newsguy.com; linux-...@lists.infradead.org; 
>> linux-ker...@vger.kernel.org;
>> davinci-linux-open-source@linux.davincidsp.com; 
>> linux-arm-ker...@lists.infradead.org
>> Cc: Karicheri, Muralidharan
>> Subject: [PATCH 1/1] mtd:nand:clk: preparation for switch to common clock 
>> framework
>> 
>> 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(). Until the platform is
>> switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
>> adds a might_sleep() call and would work without any issues.
>> 
>> This will make it easy later to switch to common clk based implementation
>> of clk driver from DaVinci specific driver.
>> 
>> Signed-off-by: Murali Karicheri <m-kariche...@ti.com>
>> Reviewed-by: Mike Turquette <mturque...@linaro.org>
>> 
>> diff --git a/drivers/mtd/nand/davinci_nand.c 
>> b/drivers/mtd/nand/davinci_nand.c
>> index f386b3c..df1ab7d 100644
>> --- a/drivers/mtd/nand/davinci_nand.c
>> +++ b/drivers/mtd/nand/davinci_nand.c
>> @@ -724,7 +724,7 @@ static int __init nand_davinci_probe(struct 
>> platform_device
>> *pdev)
>>              goto err_clk;
>>      }
>> 
>> -    ret = clk_enable(info->clk);
>> +    ret = clk_prepare_enable(info->clk);
>>      if (ret < 0) {
>>              dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n",
>>                      ret);
>> @@ -835,7 +835,7 @@ syndrome_done:
>> 
>>  err_scan:
>>  err_timing:
>> -    clk_disable(info->clk);
>> +    clk_disable_unprepare(info->clk);
>> 
>>  err_clk_enable:
>>      clk_put(info->clk);
>> @@ -872,7 +872,7 @@ static int __exit nand_davinci_remove(struct 
>> platform_device
>> *pdev)
>> 
>>      nand_release(&info->mtd);
>> 
>> -    clk_disable(info->clk);
>> +    clk_disable_unprepare(info->clk);
>>      clk_put(info->clk);
>> 
>>      kfree(info);
>> --
>> 1.7.9.5

Could you please review and apply this patch to mtd subsystem tree for 
linux-next?

Murali Karicheri
Software Design Engineer


_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to