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

Commit 7bc0c4ba authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

ARM: OMAP: mcbsp: Start generalize signal muxing functions 



This generalizes the omap2_mcbsp1_mux_clkr_src and omap2_mcbsp1_mux_fsr_src
implementation between generic McBSP and OMAP2 specific McBSP code. These
functions are used to select source for CLKR and FSR signals on OMAP2+.

Start generalizing the code by implementing an optional mux_signal function
pointer in platform data that will implement the actual muxing and which is
called now from omap2_mcbsp1_mux_clkr_src and omap2_mcbsp1_mux_fsr_src.
These functions are to be removed later and cleanup the API so that
mux_signal gets its arguments directly from client code.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 09d28d2c

arch/arm/mach-omap2/mcbsp.c

+24 −19
Original line number Diff line number Diff line
@@ -34,33 +34,36 @@ 
#include "cm2xxx_3xxx.h"

#include "cm-regbits-34xx.h"



/* McBSP internal signal muxing functions */



void omap2_mcbsp1_mux_clkr_src(u8 mux)

/* McBSP internal signal muxing function */

static int omap2_mcbsp1_mux_rx_clk(struct device *dev, const char *signal,

				   const char *src)

{

	u32 v;



	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	if (mux == CLKR_SRC_CLKR)



	if (!strcmp(signal, "clkr")) {

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

			v &= ~OMAP2_MCBSP1_CLKR_MASK;

	else if (mux == CLKR_SRC_CLKX)

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

			v |= OMAP2_MCBSP1_CLKR_MASK;

	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

}

EXPORT_SYMBOL(omap2_mcbsp1_mux_clkr_src);



void omap2_mcbsp1_mux_fsr_src(u8 mux)

{

	u32 v;



	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	if (mux == FSR_SRC_FSR)

		else

			return -EINVAL;

	} else if (!strcmp(signal, "fsr")) {

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

			v &= ~OMAP2_MCBSP1_FSR_MASK;

	else if (mux == FSR_SRC_FSX)

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

			v |= OMAP2_MCBSP1_FSR_MASK;

		else

			return -EINVAL;

	} else {

		return -EINVAL;

	}



	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);



	return 0;

}

EXPORT_SYMBOL(omap2_mcbsp1_mux_fsr_src);



/* McBSP CLKS source switching function */

static int omap2_mcbsp_set_clk_src(struct device *dev, struct clk *clk,
@@ -181,6 +184,8 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) 
		return PTR_ERR(pdev);

	}

	pdata->set_clk_src = omap2_mcbsp_set_clk_src;

	if (id == 1)

		pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;

	omap_mcbsp_count++;

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ struct omap_mcbsp_platform_data { 
	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);

};



struct omap_mcbsp_st_data {

arch/arm/plat-omap/mcbsp.c

+28 −8
Original line number Diff line number Diff line
@@ -922,21 +922,41 @@ int omap2_mcbsp_set_clks_src(u8 id, u8 fck_src_id) 
}

EXPORT_SYMBOL(omap2_mcbsp_set_clks_src);



#ifndef CONFIG_ARCH_OMAP2PLUS

void omap2_mcbsp1_mux_clkr_src(u8 mux)

{

	WARN(1, "%s: should never be called on an OMAP1-only kernel\n",

	     __func__);

	struct omap_mcbsp *mcbsp;

	const char *src;



	if (mux == CLKR_SRC_CLKR)

		src = "clkr";

	else if (mux == CLKR_SRC_CLKX)

		src = "clkx";

	else

		return;



	mcbsp = id_to_mcbsp_ptr(0);

	if (mcbsp->pdata->mux_signal)

		mcbsp->pdata->mux_signal(mcbsp->dev, "clkr", src);

}

EXPORT_SYMBOL(omap2_mcbsp1_mux_clkr_src);



void omap2_mcbsp1_mux_fsr_src(u8 mux)

{

	WARN(1, "%s: should never be called on an OMAP1-only kernel\n",

	     __func__);

	struct omap_mcbsp *mcbsp;

	const char *src;



	if (mux == FSR_SRC_FSR)

		src = "fsr";

	else if (mux == FSR_SRC_FSX)

		src = "fsx";

	else

		return;



	mcbsp = id_to_mcbsp_ptr(0);

	if (mcbsp->pdata->mux_signal)

		mcbsp->pdata->mux_signal(mcbsp->dev, "fsr", src);

}

#endif

EXPORT_SYMBOL(omap2_mcbsp1_mux_fsr_src);



#define max_thres(m)			(mcbsp->pdata->buffer_size)

#define valid_threshold(m, val)		((val) <= max_thres(m))