[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <3E54258959B69E4282D79E01AB1F32B7041B6EDA@DFLE12.ent.ti.com>
Date: Fri, 7 Sep 2012 18:39:16 +0000
From: "Karicheri, Muralidharan" <m-karicheri2@...com>
To: "Karicheri, Muralidharan" <m-karicheri2@...com>,
"dwmw2@...radead.org" <dwmw2@...radead.org>,
"artem.bityutskiy@...ux.intel.com" <artem.bityutskiy@...ux.intel.com>,
"dbaryshkov@...il.com" <dbaryshkov@...il.com>,
"computersforpeace@...il.com" <computersforpeace@...il.com>,
"linux-mtd@...ts.infradead.org" <linux-mtd@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"mturquette@...aro.org" <mturquette@...aro.org>,
"davinci-linux-open-source@...ux.davincidsp.com"
<davinci-linux-open-source@...ux.davincidsp.com>
Subject: RE: [PATCH] mtd:nand:clk: preparation for switch to common clock
framework
>> -----Original Message-----
>> From: Karicheri, Muralidharan
>> Sent: Thursday, August 30, 2012 2:17 PM
>> To: dwmw2@...radead.org; artem.bityutskiy@...ux.intel.com; dbaryshkov@...il.com;
>> computersforpeace@...il.com; linux-mtd@...ts.infradead.org; linux-
>> kernel@...r.kernel.org; mturquette@...aro.org
>> Cc: Karicheri, Muralidharan
>> Subject: [PATCH] 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-karicheri2@...com>
>> ---
>> drivers/mtd/nand/davinci_nand.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
>> index d94b03c..6b8cf27 100644
>> --- a/drivers/mtd/nand/davinci_nand.c
>> +++ b/drivers/mtd/nand/davinci_nand.c
>> @@ -656,7 +656,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);
>> @@ -767,7 +767,7 @@ syndrome_done:
>>
>> err_scan:
>> err_timing:
>> - clk_disable(info->clk);
>> + clk_disable_unprepare(info->clk);
>>
>> err_clk_enable:
>> clk_put(info->clk);
>> @@ -804,7 +804,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
subsystem owner,
Could you please review and apply this patch as needed? We need to get this upstream before submitting the patch for Common clock framework support for mach-davinci. If I need to follow a specific procedure to get this merged, please direct me to a process page.
Thanks.
Murali Karicheri
Software Design Engineer
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists