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

Commit c7988afd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v4.2-3' of... 

Merge tag 'asoc-v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: A couple more updates for v4.2

These were sitting on my laptop.
parents 57fa8a1e f76b2402

sound/soc/codecs/arizona.c

+27 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,33 @@ int arizona_set_output_mode(struct snd_soc_codec *codec, int output, bool diff) 
}

EXPORT_SYMBOL_GPL(arizona_set_output_mode);



static const struct soc_enum arizona_adsp2_rate_enum[] = {

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP1_CONTROL_1,

			      ARIZONA_DSP1_RATE_SHIFT, 0xf,

			      ARIZONA_RATE_ENUM_SIZE,

			      arizona_rate_text, arizona_rate_val),

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP2_CONTROL_1,

			      ARIZONA_DSP1_RATE_SHIFT, 0xf,

			      ARIZONA_RATE_ENUM_SIZE,

			      arizona_rate_text, arizona_rate_val),

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,

			      ARIZONA_DSP1_RATE_SHIFT, 0xf,

			      ARIZONA_RATE_ENUM_SIZE,

			      arizona_rate_text, arizona_rate_val),

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP4_CONTROL_1,

			      ARIZONA_DSP1_RATE_SHIFT, 0xf,

			      ARIZONA_RATE_ENUM_SIZE,

			      arizona_rate_text, arizona_rate_val),

};



const struct snd_kcontrol_new arizona_adsp2_rate_controls[] = {

	SOC_ENUM("DSP1 Rate", arizona_adsp2_rate_enum[0]),

	SOC_ENUM("DSP2 Rate", arizona_adsp2_rate_enum[1]),

	SOC_ENUM("DSP3 Rate", arizona_adsp2_rate_enum[2]),

	SOC_ENUM("DSP4 Rate", arizona_adsp2_rate_enum[3]),

};

EXPORT_SYMBOL_GPL(arizona_adsp2_rate_controls);



MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");

MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");

MODULE_LICENSE("GPL");

sound/soc/codecs/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ extern const struct soc_enum arizona_ng_hold; 
extern const struct soc_enum arizona_in_hpf_cut_enum;

extern const struct soc_enum arizona_in_dmic_osr[];



extern const struct snd_kcontrol_new arizona_adsp2_rate_controls[];



extern int arizona_in_ev(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *kcontrol,

			 int event);

sound/soc/codecs/wm2200.c

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ static int wm2200_probe(struct snd_soc_codec *codec) 


	wm2200->codec = codec;



	ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2);

	ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 2);

	if (ret != 0)

		return ret;

sound/soc/codecs/wm5102.c

+5 −0
Original line number Diff line number Diff line
@@ -1880,6 +1880,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) 
	if (ret)

		return ret;



	ret = snd_soc_add_codec_controls(codec,

					 arizona_adsp2_rate_controls, 1);

	if (ret)

		return ret;



	arizona_init_spk(codec);

	arizona_init_gpio(codec);

sound/soc/codecs/wm5110.c

+6 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,12 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) 
			return ret;

	}



	ret = snd_soc_add_codec_controls(codec,

					 arizona_adsp2_rate_controls,

					 WM5110_NUM_ADSP);

	if (ret)

		return ret;



	snd_soc_dapm_disable_pin(dapm, "HAPTICS");



	return 0;