Unverified Commit ecd77d49 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_wm5102: Add jack detect support 



Add jack detect support by creating a jack and calling
snd_soc_component_set_jack to register the created jack
with the codec.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210307151807.35201-14-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 37dbabf1

sound/soc/intel/boards/bytcr_wm5102.c

+27 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spi/spi.h>

#include <sound/jack.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -31,6 +32,7 @@ 
#define WM5102_MAX_SYSCLK_11025	45158400 /* max sysclk for 11.025K family */



struct byt_wm5102_private {

	struct snd_soc_jack jack;

	struct clk *mclk;

	struct gpio_desc *spkvdd_en_gpio;

};
@@ -177,11 +179,23 @@ static const struct snd_kcontrol_new byt_wm5102_controls[] = { 
	SOC_DAPM_PIN_SWITCH("Speaker"),

};



static struct snd_soc_jack_pin byt_wm5102_pins[] = {

	{

		.pin	= "Headphone",

		.mask	= SND_JACK_HEADPHONE,

	},

	{

		.pin	= "Headset Mic",

		.mask	= SND_JACK_MICROPHONE,

	},

};



static int byt_wm5102_init(struct snd_soc_pcm_runtime *runtime)

{

	struct snd_soc_card *card = runtime->card;

	struct byt_wm5102_private *priv = snd_soc_card_get_drvdata(card);

	int ret;

	struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component;

	int ret, jack_type;



	card->dapm.idle_bias_off = true;
@@ -210,6 +224,18 @@ static int byt_wm5102_init(struct snd_soc_pcm_runtime *runtime) 
		return ret;

	}



	jack_type = ARIZONA_JACK_MASK | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

		    SND_JACK_BTN_2 | SND_JACK_BTN_3;

	ret = snd_soc_card_jack_new(card, "Headset", jack_type,

				    &priv->jack, byt_wm5102_pins,

				    ARRAY_SIZE(byt_wm5102_pins));

	if (ret) {

		dev_err(card->dev, "Error creating jack: %d\n", ret);

		return ret;

	}



	snd_soc_component_set_jack(component, &priv->jack, NULL);



	return 0;

}