Commit bf86f07e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.37' of... 

Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
parents 2811fe2b 23353850

sound/soc/omap/omap-mcbsp.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -644,15 +644,23 @@ 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;

		omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR);

		omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR);

		break;

		break;

	case OMAP_MCBSP_CLKR_SRC_CLKX:

	case OMAP_MCBSP_CLKR_SRC_CLKX:

		if (cpu_class_is_omap1())

			break;

		omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX);

		omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX);

		break;

		break;

	case OMAP_MCBSP_FSR_SRC_FSR:

	case OMAP_MCBSP_FSR_SRC_FSR:

		if (cpu_class_is_omap1())

			break;

		omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR);

		omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR);

		break;

		break;

	case OMAP_MCBSP_FSR_SRC_FSX:

	case OMAP_MCBSP_FSR_SRC_FSX:

		if (cpu_class_is_omap1())

			break;

		omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX);

		omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX);

		break;

		break;

	default:

	default: