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

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

Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

A couple of small, driver specific fixes - nothing too exciting going
on.
parents ef8d60fb e555cf36

sound/soc/codecs/ak4642.c

+16 −15
Original line number Original line Diff line number Diff line
@@ -146,13 +146,10 @@ static const struct snd_kcontrol_new ak4642_snd_controls[] = { 




	SOC_DOUBLE_R_TLV("Digital Playback Volume", L_DVC, R_DVC,

	SOC_DOUBLE_R_TLV("Digital Playback Volume", L_DVC, R_DVC,

			 0, 0xFF, 1, out_tlv),

			 0, 0xFF, 1, out_tlv),



	SOC_SINGLE("Headphone Switch", PW_MGMT2, 6, 1, 0),

};

};





static const struct snd_kcontrol_new ak4642_hpout_mixer_controls[] = {

static const struct snd_kcontrol_new ak4642_headphone_control =

	SOC_DAPM_SINGLE("DACH", MD_CTL4, 0, 1, 0),

	SOC_DAPM_SINGLE("Switch", PW_MGMT2, 6, 1, 0);

};





static const struct snd_kcontrol_new ak4642_lout_mixer_controls[] = {

static const struct snd_kcontrol_new ak4642_lout_mixer_controls[] = {

	SOC_DAPM_SINGLE("DACL", SG_SL1, 4, 1, 0),

	SOC_DAPM_SINGLE("DACL", SG_SL1, 4, 1, 0),
@@ -165,13 +162,12 @@ static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("HPOUTR"),

	SND_SOC_DAPM_OUTPUT("HPOUTR"),

	SND_SOC_DAPM_OUTPUT("LINEOUT"),

	SND_SOC_DAPM_OUTPUT("LINEOUT"),





	SND_SOC_DAPM_MIXER("HPOUTL Mixer", PW_MGMT2, 5, 0,

	SND_SOC_DAPM_PGA("HPL Out", PW_MGMT2, 5, 0, NULL, 0),

			   &ak4642_hpout_mixer_controls[0],

	SND_SOC_DAPM_PGA("HPR Out", PW_MGMT2, 4, 0, NULL, 0),

			   ARRAY_SIZE(ak4642_hpout_mixer_controls)),

	SND_SOC_DAPM_SWITCH("Headphone Enable", SND_SOC_NOPM, 0, 0,

			    &ak4642_headphone_control),





	SND_SOC_DAPM_MIXER("HPOUTR Mixer", PW_MGMT2, 4, 0,

	SND_SOC_DAPM_PGA("DACH", MD_CTL4, 0, 0, NULL, 0),

			   &ak4642_hpout_mixer_controls[0],

			   ARRAY_SIZE(ak4642_hpout_mixer_controls)),





	SND_SOC_DAPM_MIXER("LINEOUT Mixer", PW_MGMT1, 3, 0,

	SND_SOC_DAPM_MIXER("LINEOUT Mixer", PW_MGMT1, 3, 0,

			   &ak4642_lout_mixer_controls[0],

			   &ak4642_lout_mixer_controls[0],
@@ -184,12 +180,17 @@ static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = { 
static const struct snd_soc_dapm_route ak4642_intercon[] = {

static const struct snd_soc_dapm_route ak4642_intercon[] = {





	/* Outputs */

	/* Outputs */

	{"HPOUTL", NULL, "HPOUTL Mixer"},

	{"HPOUTL", NULL, "HPL Out"},

	{"HPOUTR", NULL, "HPOUTR Mixer"},

	{"HPOUTR", NULL, "HPR Out"},

	{"LINEOUT", NULL, "LINEOUT Mixer"},

	{"LINEOUT", NULL, "LINEOUT Mixer"},





	{"HPOUTL Mixer", "DACH", "DAC"},

	{"HPL Out", NULL, "Headphone Enable"},

	{"HPOUTR Mixer", "DACH", "DAC"},

	{"HPR Out", NULL, "Headphone Enable"},



	{"Headphone Enable", "Switch", "DACH"},



	{"DACH", NULL, "DAC"},



	{"LINEOUT Mixer", "DACL", "DAC"},

	{"LINEOUT Mixer", "DACL", "DAC"},

};

};

sound/soc/codecs/wm8962.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2564,7 +2564,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w, 
	return 0;

	return 0;

}

}





static const char *st_text[] = { "None", "Right", "Left" };

static const char *st_text[] = { "None", "Left", "Right" };





static const struct soc_enum str_enum =

static const struct soc_enum str_enum =

	SOC_ENUM_SINGLE(WM8962_DAC_DSP_MIXING_1, 2, 3, st_text);

	SOC_ENUM_SINGLE(WM8962_DAC_DSP_MIXING_1, 2, 3, st_text);