Commit af6b7a82 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control',... 

Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732x', 'asoc/fix/fsl-ssi', 'asoc/fix/lock' and 'asoc/fix/rt286' into asoc-linus
parents 016e81f2 ce9594c6 87a8b286 8e6a75c1 6c8ca30e 34e81ab4 a4ee5561

sound/soc/codecs/adav80x.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

	unsigned int deemph = ucontrol->value.enumerated.item[0];

	unsigned int deemph = ucontrol->value.integer.value[0];



	if (deemph > 1)

		return -EINVAL;
@@ -333,7 +333,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = adav80x->deemph;

	ucontrol->value.integer.value[0] = adav80x->deemph;

	return 0;

};

sound/soc/codecs/ak4641.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);

	int deemph = ucontrol->value.enumerated.item[0];

	int deemph = ucontrol->value.integer.value[0];



	if (deemph > 1)

		return -EINVAL;
@@ -92,7 +92,7 @@ static int ak4641_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = ak4641->deemph;

	ucontrol->value.integer.value[0] = ak4641->deemph;

	return 0;

};

sound/soc/codecs/ak4671.c

+22 −22
Original line number Diff line number Diff line
@@ -343,25 +343,25 @@ static const struct snd_soc_dapm_widget ak4671_dapm_widgets[] = { 
};



static const struct snd_soc_dapm_route ak4671_intercon[] = {

	{"DAC Left", "NULL", "PMPLL"},

	{"DAC Right", "NULL", "PMPLL"},

	{"ADC Left", "NULL", "PMPLL"},

	{"ADC Right", "NULL", "PMPLL"},

	{"DAC Left", NULL, "PMPLL"},

	{"DAC Right", NULL, "PMPLL"},

	{"ADC Left", NULL, "PMPLL"},

	{"ADC Right", NULL, "PMPLL"},



	/* Outputs */

	{"LOUT1", "NULL", "LOUT1 Mixer"},

	{"ROUT1", "NULL", "ROUT1 Mixer"},

	{"LOUT2", "NULL", "LOUT2 Mix Amp"},

	{"ROUT2", "NULL", "ROUT2 Mix Amp"},

	{"LOUT3", "NULL", "LOUT3 Mixer"},

	{"ROUT3", "NULL", "ROUT3 Mixer"},

	{"LOUT1", NULL, "LOUT1 Mixer"},

	{"ROUT1", NULL, "ROUT1 Mixer"},

	{"LOUT2", NULL, "LOUT2 Mix Amp"},

	{"ROUT2", NULL, "ROUT2 Mix Amp"},

	{"LOUT3", NULL, "LOUT3 Mixer"},

	{"ROUT3", NULL, "ROUT3 Mixer"},



	{"LOUT1 Mixer", "DACL", "DAC Left"},

	{"ROUT1 Mixer", "DACR", "DAC Right"},

	{"LOUT2 Mixer", "DACHL", "DAC Left"},

	{"ROUT2 Mixer", "DACHR", "DAC Right"},

	{"LOUT2 Mix Amp", "NULL", "LOUT2 Mixer"},

	{"ROUT2 Mix Amp", "NULL", "ROUT2 Mixer"},

	{"LOUT2 Mix Amp", NULL, "LOUT2 Mixer"},

	{"ROUT2 Mix Amp", NULL, "ROUT2 Mixer"},

	{"LOUT3 Mixer", "DACSL", "DAC Left"},

	{"ROUT3 Mixer", "DACSR", "DAC Right"},
@@ -381,18 +381,18 @@ static const struct snd_soc_dapm_route ak4671_intercon[] = { 
	{"LIN2", NULL, "Mic Bias"},

	{"RIN2", NULL, "Mic Bias"},



	{"ADC Left", "NULL", "LIN MUX"},

	{"ADC Right", "NULL", "RIN MUX"},

	{"ADC Left", NULL, "LIN MUX"},

	{"ADC Right", NULL, "RIN MUX"},



	/* Analog Loops */

	{"LIN1 Mixing Circuit", "NULL", "LIN1"},

	{"RIN1 Mixing Circuit", "NULL", "RIN1"},

	{"LIN2 Mixing Circuit", "NULL", "LIN2"},

	{"RIN2 Mixing Circuit", "NULL", "RIN2"},

	{"LIN3 Mixing Circuit", "NULL", "LIN3"},

	{"RIN3 Mixing Circuit", "NULL", "RIN3"},

	{"LIN4 Mixing Circuit", "NULL", "LIN4"},

	{"RIN4 Mixing Circuit", "NULL", "RIN4"},

	{"LIN1 Mixing Circuit", NULL, "LIN1"},

	{"RIN1 Mixing Circuit", NULL, "RIN1"},

	{"LIN2 Mixing Circuit", NULL, "LIN2"},

	{"RIN2 Mixing Circuit", NULL, "RIN2"},

	{"LIN3 Mixing Circuit", NULL, "LIN3"},

	{"RIN3 Mixing Circuit", NULL, "RIN3"},

	{"LIN4 Mixing Circuit", NULL, "LIN4"},

	{"RIN4 Mixing Circuit", NULL, "RIN4"},



	{"LOUT1 Mixer", "LINL1", "LIN1 Mixing Circuit"},

	{"ROUT1 Mixer", "RINR1", "RIN1 Mixing Circuit"},

sound/soc/codecs/cs4271.c

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = cs4271->deemph;

	ucontrol->value.integer.value[0] = cs4271->deemph;

	return 0;

}
@@ -296,7 +296,7 @@ static int cs4271_put_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);



	cs4271->deemph = ucontrol->value.enumerated.item[0];

	cs4271->deemph = ucontrol->value.integer.value[0];

	return cs4271_set_deemph(codec);

}

sound/soc/codecs/da732x.c

+4 −4
Original line number Diff line number Diff line
@@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = { 


static const struct snd_soc_dapm_route da732x_dapm_routes[] = {

	/* Inputs */

	{"AUX1L PGA", "NULL", "AUX1L"},

	{"AUX1R PGA", "NULL", "AUX1R"},

	{"AUX1L PGA", NULL, "AUX1L"},

	{"AUX1R PGA", NULL, "AUX1R"},

	{"MIC1 PGA", NULL, "MIC1"},

	{"MIC2 PGA", "NULL", "MIC2"},

	{"MIC3 PGA", "NULL", "MIC3"},

	{"MIC2 PGA", NULL, "MIC2"},

	{"MIC3 PGA", NULL, "MIC3"},



	/* Capture Path */

	{"ADC1 Left MUX", "MIC1", "MIC1 PGA"},