>> -----Original Message----- >> From: Karicheri, Muralidharan >> Sent: Thursday, August 30, 2012 2:25 PM >> To: [email protected]; [email protected]; spi-devel- >> [email protected]; [email protected] >> Cc: Karicheri, Muralidharan >> Subject: [PATCH] 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 <[email protected]> >> --- >> drivers/spi/spi-davinci.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c >> index 9b2901f..71a6423 100644 >> --- a/drivers/spi/spi-davinci.c >> +++ b/drivers/spi/spi-davinci.c >> @@ -873,7 +873,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; >> @@ -959,7 +959,7 @@ free_dma: >> edma_free_channel(dspi->dma.rx_channel); >> edma_free_slot(dspi->dma.dummy_param_slot); >> free_clk: >> - clk_disable(dspi->clk); >> + clk_disable_unprepare(dspi->clk); >> clk_put(dspi->clk); >> put_master: >> spi_master_put(master); >> @@ -995,7 +995,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
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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
