Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e95496d4 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

OMAP: McBSP: Add pm runtime support 



Add pm runtime support for McBSP driver.
Reference to fclk is not removed because it is required when the
functional clock is switched from one source to another.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f36d01d6

arch/arm/mach-omap2/mcbsp.c

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <plat/cpu.h>

#include <plat/mcbsp.h>

#include <plat/omap_device.h>

#include <linux/pm_runtime.h>



#include "control.h"
@@ -83,7 +84,7 @@ int omap2_mcbsp_set_clks_src(u8 id, u8 fck_src_id) 
		return -EINVAL;

	}



	clk_disable(mcbsp->fclk);

	pm_runtime_put_sync(mcbsp->dev);



	r = clk_set_parent(mcbsp->fclk, fck_src);

	if (IS_ERR_VALUE(r)) {
@@ -93,7 +94,7 @@ int omap2_mcbsp_set_clks_src(u8 id, u8 fck_src_id) 
		return -EINVAL;

	}



	clk_enable(mcbsp->fclk);

	pm_runtime_get_sync(mcbsp->dev);



	clk_put(fck_src);

arch/arm/plat-omap/include/plat/mcbsp.h

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ struct omap_mcbsp { 
	/* Protect the field .free, while checking if the mcbsp is in use */

	spinlock_t lock;

	struct omap_mcbsp_platform_data *pdata;

	struct clk *iclk;

	struct clk *fclk;

#ifdef CONFIG_ARCH_OMAP3

	struct omap_mcbsp_st_data *st_data;

arch/arm/plat-omap/mcbsp.c

+6 −17
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <plat/dma.h>

#include <plat/mcbsp.h>

#include <plat/omap_device.h>

#include <linux/pm_runtime.h>



/* XXX These "sideways" includes are a sign that something is wrong */

#include "../mach-omap2/cm2xxx_3xxx.h"
@@ -757,8 +758,7 @@ int omap_mcbsp_request(unsigned int id) 
	if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)

		mcbsp->pdata->ops->request(id);



	clk_enable(mcbsp->iclk);

	clk_enable(mcbsp->fclk);

	pm_runtime_get_sync(mcbsp->dev);



	/* Do procedure specific to omap34xx arch, if applicable */

	omap34xx_mcbsp_request(mcbsp);
@@ -806,8 +806,7 @@ int omap_mcbsp_request(unsigned int id) 
	/* Do procedure specific to omap34xx arch, if applicable */

	omap34xx_mcbsp_free(mcbsp);



	clk_disable(mcbsp->fclk);

	clk_disable(mcbsp->iclk);

	pm_runtime_put_sync(mcbsp->dev);



	spin_lock(&mcbsp->lock);

	mcbsp->free = true;
@@ -837,8 +836,7 @@ void omap_mcbsp_free(unsigned int id) 
	/* Do procedure specific to omap34xx arch, if applicable */

	omap34xx_mcbsp_free(mcbsp);



	clk_disable(mcbsp->fclk);

	clk_disable(mcbsp->iclk);

	pm_runtime_put_sync(mcbsp->dev);



	if (mcbsp->io_type == OMAP_MCBSP_IRQ_IO) {

		/* Free IRQs */
@@ -1827,32 +1825,24 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) 
	}

	mcbsp->dma_tx_sync = res->start;



	mcbsp->iclk = clk_get(&pdev->dev, "ick");

	if (IS_ERR(mcbsp->iclk)) {

		ret = PTR_ERR(mcbsp->iclk);

		dev_err(&pdev->dev, "unable to get ick: %d\n", ret);

		goto err_res;

	}



	mcbsp->fclk = clk_get(&pdev->dev, "fck");

	if (IS_ERR(mcbsp->fclk)) {

		ret = PTR_ERR(mcbsp->fclk);

		dev_err(&pdev->dev, "unable to get fck: %d\n", ret);

		goto err_fclk;

		goto err_res;

	}



	mcbsp->pdata = pdata;

	mcbsp->dev = &pdev->dev;

	mcbsp_ptr[id] = mcbsp;

	platform_set_drvdata(pdev, mcbsp);

	pm_runtime_enable(mcbsp->dev);



	/* Initialize mcbsp properties for OMAP34XX if needed / applicable */

	omap34xx_device_init(mcbsp);



	return 0;



err_fclk:

	clk_put(mcbsp->iclk);

err_res:

	iounmap(mcbsp->io_base);

err_ioremap:
@@ -1875,7 +1865,6 @@ static int __devexit omap_mcbsp_remove(struct platform_device *pdev) 
		omap34xx_device_exit(mcbsp);



		clk_put(mcbsp->fclk);

		clk_put(mcbsp->iclk);



		iounmap(mcbsp->io_base);

		kfree(mcbsp);