Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 19:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: omap-mcbsp: Correct clock muxing for CLKR/FSR signals

Browse Source 
Remove the no longer valid check for McBSP1 regarding to signal mux
selection (on OMAP4 McBSP4 has 6 pin setup).
Only clear the srgr2, pcr0 register configuration if the requested clock
configuration will actually going to touch it. In this way we can avoid
issues if the CLKR/FSR mux has been configured after the clock selection.

We are going to check for the valid McBSP port in the
omap_mcbsp_6pin_src_mux() function based on the validity of the mux_signal
callback (which is only valid for ports having 6 pin setup).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Peter Ujfalusi 2012-03-08 13:34:16 +02:00 committed by Liam Girdwood
parent cd1f08c7f6
commit 5788c62e72
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/omap/mcbsp.c
View File

@ -690,7 +690,9 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux) int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
{ {
const char *signal, *src; const char *signal, *src;
int ret = 0;
if (mcbsp->pdata->mux_signal)
return -EINVAL;
switch (mux) { switch (mux) {
case CLKR_SRC_CLKR: case CLKR_SRC_CLKR:
@ -713,10 +715,7 @@ int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
return -EINVAL; return -EINVAL;
} }
if (mcbsp->pdata->mux_signal) return mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
ret = mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
return ret;
} }
#define max_thres(m) (mcbsp->pdata->buffer_size) #define max_thres(m) (mcbsp->pdata->buffer_size)

34
sound/soc/omap/omap-mcbsp.c
View File

@ -511,17 +511,21 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
return -EBUSY; return -EBUSY;
} }
/* The McBSP signal muxing functions are only available on McBSP1 */ if (clk_id == OMAP_MCBSP_SYSCLK_CLK ||
if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR || clk_id == OMAP_MCBSP_SYSCLK_CLKS_FCLK ||
clk_id == OMAP_MCBSP_CLKR_SRC_CLKX || clk_id == OMAP_MCBSP_SYSCLK_CLKS_EXT ||
clk_id == OMAP_MCBSP_FSR_SRC_FSR || clk_id == OMAP_MCBSP_SYSCLK_CLKX_EXT ||
clk_id == OMAP_MCBSP_FSR_SRC_FSX) clk_id == OMAP_MCBSP_SYSCLK_CLKR_EXT) {
if (cpu_class_is_omap1() || cpu_dai->id != 1) mcbsp->in_freq = freq;
return -EINVAL; regs->srgr2 &= ~CLKSM;
regs->pcr0 &= ~SCLKME;
mcbsp->in_freq = freq; } else if (cpu_class_is_omap1()) {
regs->srgr2 &= ~CLKSM; /*
regs->pcr0 &= ~SCLKME; * McBSP CLKR/FSR signal muxing functions are only available on
* OMAP2 or newer versions
*/
return -EINVAL;
}
switch (clk_id) { switch (clk_id) {
case OMAP_MCBSP_SYSCLK_CLK: case OMAP_MCBSP_SYSCLK_CLK:
@ -552,23 +556,15 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
case OMAP_MCBSP_CLKR_SRC_CLKR: case OMAP_MCBSP_CLKR_SRC_CLKR:
if (cpu_class_is_omap1())
break;
err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKR); err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKR);
break; break;
case OMAP_MCBSP_CLKR_SRC_CLKX: case OMAP_MCBSP_CLKR_SRC_CLKX:
if (cpu_class_is_omap1())
break;
err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKX); err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKX);
break; break;
case OMAP_MCBSP_FSR_SRC_FSR: case OMAP_MCBSP_FSR_SRC_FSR:
if (cpu_class_is_omap1())
break;
err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSR); err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSR);
break; break;
case OMAP_MCBSP_FSR_SRC_FSX: case OMAP_MCBSP_FSR_SRC_FSX:
if (cpu_class_is_omap1())
break;
err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSX); err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSX);
break; break;
default: default: