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

Commit 68d5a59e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Allow userspace control of Speyside headphone output 



In order to facilitate the widest range of use cases (especially things
like speakerphone) allow the headphone output to be enabled and disabled
by the application layer.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 42bef686

sound/soc/samsung/speyside.c

+1 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ static struct snd_soc_jack_pin speyside_headset_pins[] = { 
		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

	{

		.pin = "Headphone",

		.mask = SND_JACK_HEADPHONE,

	},

};



/* Default the headphone selection to active high */
@@ -252,6 +248,7 @@ static const struct snd_kcontrol_new controls[] = { 
	SOC_DAPM_PIN_SWITCH("Main AMIC"),

	SOC_DAPM_PIN_SWITCH("WM1250 Input"),

	SOC_DAPM_PIN_SWITCH("WM1250 Output"),

	SOC_DAPM_PIN_SWITCH("Headphone"),

};



static struct snd_soc_dapm_widget widgets[] = {