Commit dfec4a6e authored by Boris Brezillon's avatar Boris Brezillon Committed by Mark Brown
Browse files

spi: atmel: prepare clk before calling enable 



Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ad81f054

drivers/spi/spi-atmel.c

+7 −5
Original line number Diff line number Diff line
@@ -1579,7 +1579,9 @@ static int atmel_spi_probe(struct platform_device *pdev) 
		goto out_unmap_regs;



	/* Initialize the hardware */

	clk_enable(clk);

	ret = clk_prepare_enable(clk);

	if (ret)

		goto out_unmap_regs;

	spi_writel(as, CR, SPI_BIT(SWRST));

	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */

	if (as->caps.has_wdrbt) {
@@ -1609,7 +1611,7 @@ static int atmel_spi_probe(struct platform_device *pdev) 


	spi_writel(as, CR, SPI_BIT(SWRST));

	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */

	clk_disable(clk);

	clk_disable_unprepare(clk);

	free_irq(irq, master);

out_unmap_regs:

	iounmap(as->regs);
@@ -1661,7 +1663,7 @@ static int atmel_spi_remove(struct platform_device *pdev) 
	dma_free_coherent(&pdev->dev, BUFFER_SIZE, as->buffer,

			as->buffer_dma);



	clk_disable(as->clk);

	clk_disable_unprepare(as->clk);

	clk_put(as->clk);

	free_irq(as->irq, master);

	iounmap(as->regs);
@@ -1678,7 +1680,7 @@ static int atmel_spi_suspend(struct platform_device *pdev, pm_message_t mesg) 
	struct spi_master	*master = platform_get_drvdata(pdev);

	struct atmel_spi	*as = spi_master_get_devdata(master);



	clk_disable(as->clk);

	clk_disable_unprepare(as->clk);

	return 0;

}
@@ -1687,7 +1689,7 @@ static int atmel_spi_resume(struct platform_device *pdev) 
	struct spi_master	*master = platform_get_drvdata(pdev);

	struct atmel_spi	*as = spi_master_get_devdata(master);



	clk_enable(as->clk);

	return clk_prepare_enable(as->clk);

	return 0;

}