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

Commit 0e796120 authored by Eric Bénard's avatar Eric Bénard Committed by Mark Brown
Browse files

ASoC: imx-ssi.c: add new choices to platform configuration 



* introduce 3 new flags to allow a more detailed configuration
of the SSI link :
	IMX_SSI_NET : enable Network Mode
	IMX_SSI_SYN : enable Synchronous Mode
	IMX_SSI_USE_I2S_SLAVE : enable I2S Slave Mode
* new platform can use these settings without breaking actual
platforms.

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 749266cd

arch/arm/plat-mxc/include/mach/ssi.h

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ struct imx_ssi_platform_data { 
	unsigned int flags;

#define IMX_SSI_DMA            (1 << 0)

#define IMX_SSI_USE_AC97       (1 << 1)

#define IMX_SSI_NET            (1 << 2)

#define IMX_SSI_SYN            (1 << 3)

#define IMX_SSI_USE_I2S_SLAVE  (1 << 4)

	void (*ac97_reset) (struct snd_ac97 *ac97);

	void (*ac97_warm_reset)(struct snd_ac97 *ac97);

};

sound/soc/imx/imx-ssi.c

+9 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ static int imx_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, 
/*

 * SSI DAI format configuration.

 * Should only be called when port is inactive (i.e. SSIEN = 0).

 * Note: We don't use the I2S modes but instead manually configure the

 * SSI for I2S because the I2S mode is only a register preset.

 */

static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)

{
@@ -99,6 +97,10 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
		/* data on rising edge of bclk, frame low 1clk before data */

		strcr |= SSI_STCR_TFSI | SSI_STCR_TEFS | SSI_STCR_TXBIT0;

		scr |= SSI_SCR_NET;

		if (ssi->flags & IMX_SSI_USE_I2S_SLAVE) {

			scr &= ~SSI_I2S_MODE_MASK;

			scr |= SSI_SCR_I2S_MODE_SLAVE;

		}

		break;

	case SND_SOC_DAIFMT_LEFT_J:

		/* data on rising edge of bclk, frame high with data */
@@ -143,6 +145,11 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 


	strcr |= SSI_STCR_TFEN0;



	if (ssi->flags & IMX_SSI_NET)

		scr |= SSI_SCR_NET;

	if (ssi->flags & IMX_SSI_SYN)

		scr |= SSI_SCR_SYN;



	writel(strcr, ssi->base + SSI_STCR);

	writel(strcr, ssi->base + SSI_SRCR);

	writel(scr, ssi->base + SSI_SCR);