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

Commit 5d6bdfd5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/dai' of... 

Merge branch 'topic/dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
parents 074b89bb ddaca25a

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,9 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd); 
void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);



int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,

	unsigned int dai_fmt);



/* Utility functions to get clock rates from various things */

int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);

int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);

sound/soc/atmel/sam9g20_wm8731.c

+2 −28
Original line number Diff line number Diff line
@@ -64,33 +64,6 @@ 


static struct clk *mclk;



static int at91sam9g20ek_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	return 0;

}



static struct snd_soc_ops at91sam9g20ek_ops = {

	.hw_params = at91sam9g20ek_hw_params,

};



static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,

					struct snd_soc_dapm_context *dapm,

					enum snd_soc_bias_level level)
@@ -173,7 +146,8 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { 
	.init = at91sam9g20ek_wm8731_init,

	.platform_name = "at91rm9200_ssc.0",

	.codec_name = "wm8731.0-001b",

	.ops = &at91sam9g20ek_ops,

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

};



static struct snd_soc_card snd_soc_at91sam9g20ek = {

sound/soc/au1x/db1200.c

+3 −16
Original line number Diff line number Diff line
@@ -91,27 +91,12 @@ static int db1200_i2s_startup(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;



	/* WM8731 has its own 12MHz crystal */

	snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,

				12000000, SND_SOC_CLOCK_IN);



	/* codec is bitclock and lrclk master */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		goto out;



	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_LEFT_J |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		goto out;



	ret = 0;

out:

	return ret;

	return 0;

}



static struct snd_soc_ops db1200_i2s_wm8731_ops = {
@@ -125,6 +110,8 @@ static struct snd_soc_dai_link db1200_i2s_dai = { 
	.cpu_dai_name	= "au1xpsc_i2s.1",

	.platform_name	= "au1xpsc-pcm.1",

	.codec_name	= "wm8731.0-001b",

	.dai_fmt	= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &db1200_i2s_wm8731_ops,

};

sound/soc/fsl/eukrea-tlv320.c

+2 −19
Original line number Diff line number Diff line
@@ -42,25 +42,6 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;



	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	/* fsl_ssi lacks the set_fmt ops. */

	if (ret && ret != -ENOTSUPP) {

		dev_err(cpu_dai->dev,

			"Failed to set the cpu dai format.\n");

		return ret;

	}



	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	if (ret) {

		dev_err(cpu_dai->dev,

			"Failed to set the codec format.\n");

		return ret;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

				     CODEC_CLOCK, SND_SOC_CLOCK_OUT);

	if (ret) {
@@ -91,6 +72,8 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { 
	.name		= "tlv320aic23",

	.stream_name	= "TLV320AIC23",

	.codec_dai_name	= "tlv320aic23-hifi",

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &eukrea_tlv320_snd_ops,

};

sound/soc/fsl/mx27vis-aic32x4.c

+2 −10
Original line number Diff line number Diff line
@@ -55,16 +55,6 @@ static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;

	u32 dai_format;



	dai_format = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |

		SND_SOC_DAIFMT_CBM_CFM;



	/* set codec DAI configuration */

	snd_soc_dai_set_fmt(codec_dai, dai_format);



	/* set cpu DAI configuration */

	snd_soc_dai_set_fmt(cpu_dai, dai_format);



	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

				     25000000, SND_SOC_CLOCK_OUT);
@@ -164,6 +154,8 @@ static struct snd_soc_dai_link mx27vis_aic32x4_dai = { 
	.platform_name	= "imx-ssi.0",

	.codec_name	= "tlv320aic32x4.0-0018",

	.cpu_dai_name	= "imx-ssi.0",

	.dai_fmt	= SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &mx27vis_aic32x4_snd_ops,

};