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

Commit f199131a authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ARM/ASoC: omap-mcbsp: Move OMAP2+ clock parenting code to ASoC driver 



Move the McBSP CLKS re-parenting code to ASoC driver from
arch/arm/mach-omap2.
The call fort the re-parenting has been already limited to OMAP2+ SoC in
the ASoC driver. There is no longer need to have callback function for it.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 152c6e56

arch/arm/mach-omap2/mcbsp.c

+0 −40
Original line number Diff line number Diff line
@@ -101,45 +101,6 @@ static int omap4_mcbsp4_mux_rx_clk(struct device *dev, const char *signal, 
	return 0;

}



/* McBSP CLKS source switching function */

static int omap2_mcbsp_set_clk_src(struct device *dev, struct clk *clk,

				   const char *src)

{

	struct clk *fck_src;

	char *fck_src_name;

	int r;



	if (!strcmp(src, "clks_ext"))

		fck_src_name = "pad_fck";

	else if (!strcmp(src, "clks_fclk"))

		fck_src_name = "prcm_fck";

	else

		return -EINVAL;



	fck_src = clk_get(dev, fck_src_name);

	if (IS_ERR_OR_NULL(fck_src)) {

		pr_err("omap-mcbsp: %s: could not clk_get() %s\n", "clks",

		       fck_src_name);

		return -EINVAL;

	}



	pm_runtime_put_sync(dev);



	r = clk_set_parent(clk, fck_src);

	if (IS_ERR_VALUE(r)) {

		pr_err("omap-mcbsp: %s: could not clk_set_parent() to %s\n",

		       "clks", fck_src_name);

		clk_put(fck_src);

		return -EINVAL;

	}



	pm_runtime_get_sync(dev);



	clk_put(fck_src);



	return 0;

}



static int omap3_enable_st_clock(unsigned int id, bool enable)

{

	unsigned int w;
@@ -181,7 +142,6 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused) 
		pdata->reg_size = 4;

		pdata->has_ccr = true;

	}

	pdata->set_clk_src = omap2_mcbsp_set_clk_src;



	/* On OMAP2/3 the McBSP1 port has 6 pin configuration */

	if (id == 1 && oh->class->rev < MCBSP_CONFIG_TYPE4)

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct omap_mcbsp_platform_data { 
	bool has_wakeup; /* Wakeup capability */

	bool has_ccr; /* Transceiver has configuration control registers */

	int (*enable_st_clock)(unsigned int, bool);

	int (*set_clk_src)(struct device *dev, struct clk *clk, const char *src);

	int (*mux_signal)(struct device *dev, const char *signal, const char *src);

};

sound/soc/omap/mcbsp.c

+26 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>



#include <plat/mcbsp.h>
@@ -726,21 +727,41 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx) 


int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)

{

	struct clk *fck_src;

	const char *src;

	int r;



	if (fck_src_id == MCBSP_CLKS_PAD_SRC)

		src = "clks_ext";

		src = "pad_fck";

	else if (fck_src_id == MCBSP_CLKS_PRCM_SRC)

		src = "clks_fclk";

		src = "prcm_fck";

	else

		return -EINVAL;



	if (mcbsp->pdata->set_clk_src)

		return mcbsp->pdata->set_clk_src(mcbsp->dev, mcbsp->fclk, src);

	else

	fck_src = clk_get(mcbsp->dev, src);

	if (IS_ERR(fck_src)) {

		dev_err(mcbsp->dev, "CLKS: could not clk_get() %s\n", src);

		return -EINVAL;

	}



	pm_runtime_put_sync(mcbsp->dev);



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

	if (r) {

		dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n",

			src);

		clk_put(fck_src);

		return r;

	}



	pm_runtime_get_sync(mcbsp->dev);



	clk_put(fck_src);



	return 0;



}



int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)

{

	const char *signal, *src;