Commit 4d53952a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.35' into for-2.6.36

parents 66b47fdb 63772783

sound/soc/sh/fsi.c

+11 −16
Original line number Original line Diff line number Diff line
@@ -674,20 +674,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, 




	/* clock inversion (CKG2) */

	/* clock inversion (CKG2) */

	data = 0;

	data = 0;

	switch (SH_FSI_INVERSION_MASK & flags) {

	if (SH_FSI_LRM_INV & flags)

	case SH_FSI_LRM_INV:

		data |= 1 << 12;

		data = 1 << 12;

	if (SH_FSI_BRM_INV & flags)

		break;

		data |= 1 << 8;

	case SH_FSI_BRM_INV:

	if (SH_FSI_LRS_INV & flags)

		data = 1 << 8;

		data |= 1 << 4;

		break;

	if (SH_FSI_BRS_INV & flags)

	case SH_FSI_LRS_INV:

		data |= 1 << 0;

		data = 1 << 4;



		break;

	case SH_FSI_BRS_INV:

		data = 1 << 0;

		break;

	}

	fsi_reg_write(fsi, CKG2, data);

	fsi_reg_write(fsi, CKG2, data);





	/* do fmt, di fmt */

	/* do fmt, di fmt */
@@ -717,15 +712,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, 
		break;

		break;

	case SH_FSI_FMT_TDM:

	case SH_FSI_FMT_TDM:

		msg = "TDM";

		msg = "TDM";

		data = CR_FMT(CR_TDM) | (fsi->chan - 1);

		fsi->chan = is_play ?

		fsi->chan = is_play ?

			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);

			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);

		data = CR_FMT(CR_TDM) | (fsi->chan - 1);

		break;

		break;

	case SH_FSI_FMT_TDM_DELAY:

	case SH_FSI_FMT_TDM_DELAY:

		msg = "TDM Delay";

		msg = "TDM Delay";

		data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);

		fsi->chan = is_play ?

		fsi->chan = is_play ?

			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);

			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);

		data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);

		break;

		break;

	default:

	default:

		dev_err(dai->dev, "unknown format.\n");

		dev_err(dai->dev, "unknown format.\n");