[<prev] [next>] [day] [month] [year] [list]
Message-ID: <3E54258959B69E4282D79E01AB1F32B7041EF690@DFLE12.ent.ti.com>
Date: Fri, 28 Sep 2012 16:11:32 +0000
From: "Karicheri, Muralidharan" <m-karicheri2@...com>
To: "Karicheri, Muralidharan" <m-karicheri2@...com>,
"spi-devel-general@...ts.sourceforge.net"
<spi-devel-general@...ts.sourceforge.net>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"davinci-linux-open-source@...ux.davincidsp.com"
<davinci-linux-open-source@...ux.davincidsp.com>,
"grant.likely@...retlab.ca" <grant.likely@...retlab.ca>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
CC: "Chemparathy, Cyril" <cyril@...com>
Subject: [REMINDER: PATCH 1/1] spi:clk: preparation for switch to common
clock framework
>> -----Original Message-----
>> From: Karicheri, Muralidharan
>> Sent: Monday, September 17, 2012 12:42 PM
>> To: spi-devel-general@...ts.sourceforge.net; linux-kernel@...r.kernel.org; davinci-linux-
>> open-source@...ux.davincidsp.com; grant.likely@...retlab.ca; linux-arm-
>> kernel@...ts.infradead.org
>> Cc: Chemparathy, Cyril; Karicheri, Muralidharan
>> Subject: [PATCH 1/1] spi: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>
>> Reviewed-by: Mike Turquette <mturquette@...aro.org>
>>
>> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
>> index c1ec52d..3f54f9e 100644
>> --- a/drivers/spi/spi-davinci.c
>> +++ b/drivers/spi/spi-davinci.c
>> @@ -843,7 +843,7 @@ static int __devinit davinci_spi_probe(struct platform_device
>> *pdev)
>> ret = -ENODEV;
>> goto put_master;
>> }
>> - clk_enable(dspi->clk);
>> + clk_prepare_enable(dspi->clk);
>>
>> master->bus_num = pdev->id;
>> master->num_chipselect = pdata->num_chipselect;
>> @@ -927,7 +927,7 @@ free_dma:
>> dma_release_channel(dspi->dma_rx);
>> dma_release_channel(dspi->dma_tx);
>> free_clk:
>> - clk_disable(dspi->clk);
>> + clk_disable_unprepare(dspi->clk);
>> clk_put(dspi->clk);
>> put_master:
>> spi_master_put(master);
>> @@ -963,7 +963,7 @@ static int __devexit davinci_spi_remove(struct platform_device
>> *pdev)
>>
>> spi_bitbang_stop(&dspi->bitbang);
>>
>> - clk_disable(dspi->clk);
>> + clk_disable_unprepare(dspi->clk);
>> clk_put(dspi->clk);
>> spi_master_put(master);
>> free_irq(dspi->irq, dspi);
>> --
>> 1.7.9.5
Could you please review and apply this patch to linux-next?
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