Commit 69ab820c authored by Troy Kisky's avatar Troy Kisky Committed by Mark Brown
Browse files

ALSA: ASoC: DaVinci: davinci-i2s clean up 



Minor, just move a block of code to make next patch clearer.

Signed-off-by: default avatarTroy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 21903c1c

sound/soc/davinci/davinci-i2s.c

+15 −15
Original line number Diff line number Diff line
@@ -238,6 +238,21 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		return -EINVAL;

	}



	rcr = DAVINCI_MCBSP_RCR_RFRLEN1(1);

	xcr = DAVINCI_MCBSP_XCR_XFIG | DAVINCI_MCBSP_XCR_XFRLEN1(1);

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_RIGHT_J:

		break;

	case SND_SOC_DAIFMT_I2S:

	case SND_SOC_DAIFMT_DSP_B:

		rcr |= DAVINCI_MCBSP_RCR_RDATDLY(1);

		xcr |= DAVINCI_MCBSP_XCR_XDATDLY(1);

		break;

	default:

		printk(KERN_ERR "%s:bad format\n", __func__);

		return -EINVAL;

	}



	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_IB_NF:

		/* CLKRP Receive clock polarity,
@@ -290,21 +305,6 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	default:

		return -EINVAL;

	}



	rcr = DAVINCI_MCBSP_RCR_RFRLEN1(1);

	xcr = DAVINCI_MCBSP_XCR_XFIG | DAVINCI_MCBSP_XCR_XFRLEN1(1);

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_RIGHT_J:

		break;

	case SND_SOC_DAIFMT_I2S:

	case SND_SOC_DAIFMT_DSP_B:

		rcr |= DAVINCI_MCBSP_RCR_RDATDLY(1);

		xcr |= DAVINCI_MCBSP_XCR_XDATDLY(1);

		break;

	default:

		printk(KERN_ERR "%s:bad format\n", __func__);

		return -EINVAL;

	}

	davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SRGR_REG, srgr);

	davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_PCR_REG, pcr);

	davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_RCR_REG, rcr);