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

Commit 3f1cf657 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and... 

Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'asoc/topic/davinci' into asoc-next
parents bd862e12 cd2ee8ad ddaca25a caa1d794

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
@@ -63,33 +63,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)
@@ -172,7 +145,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/codecs/cs42l73.c

+2 −2
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static int cs42l73_probe(struct snd_soc_codec *codec) 
	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {

static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {

	.probe = cs42l73_probe,

	.set_bias_level = cs42l73_set_bias_level,

	.suspend_bias_off = true,
@@ -1361,7 +1361,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = { 
	.num_controls = ARRAY_SIZE(cs42l73_snd_controls),

};



static struct regmap_config cs42l73_regmap = {

static const struct regmap_config cs42l73_regmap = {

	.reg_bits = 8,

	.val_bits = 8,

sound/soc/davinci/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -58,13 +58,12 @@ choice 
	depends on MACH_DAVINCI_DM365_EVM



config SND_DM365_AIC3X_CODEC

	bool "Audio Codec - AIC3101"

	tristate "Audio Codec - AIC3101"

	help

	  Say Y if you want to add support for AIC3101 audio codec



config SND_DM365_VOICE_CODEC

	tristate "Voice Codec - CQ93VC"

	depends on SND_DAVINCI_SOC

	select MFD_DAVINCI_VOICECODEC

	select SND_DAVINCI_SOC_VCIF

	select SND_SOC_CQ0093VC