lkml.org 
[lkml]   [2017]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/2] ASoC: intel: byt: Add headset jack
From
Date
On 10/19/17 6:03 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> Introduce an headset jack in the machine driver and register it to the
> codec driver.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
> ---
> sound/soc/intel/boards/bytcr_rt5651.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
> index 1dad5c98c9ef..0fc850e20fc0 100644
> --- a/sound/soc/intel/boards/bytcr_rt5651.c
> +++ b/sound/soc/intel/boards/bytcr_rt5651.c
> @@ -49,6 +49,8 @@ struct byt_rt5651_private {
> struct clk *mclk;
> };
>
> +static struct snd_soc_jack jack;

nit-pick: we usually push the jack into the structure just above.

> +
> static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP |
> BYT_RT5651_DMIC_EN |
> BYT_RT5651_MCLK_EN;

wondering if we need quirks here to manage the IN2P/JD2 exclusion at
some point.

> @@ -177,6 +179,17 @@ static const struct snd_kcontrol_new byt_rt5651_controls[] = {
> SOC_DAPM_PIN_SWITCH("Speaker"),
> };
>
> +static struct snd_soc_jack_pin bytcr_jack_pins[] = {
> + {
> + .pin = "Headphone",
> + .mask = SND_JACK_HEADPHONE,
> + },
> + {
> + .pin = "Headset Mic",
> + .mask = SND_JACK_MICROPHONE,
> + },
> +};
> +
> static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream,
> struct snd_pcm_hw_params *params)
> {
> @@ -244,6 +257,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
> static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
> {
> struct snd_soc_card *card = runtime->card;
> + struct snd_soc_codec *codec = runtime->codec;
> struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);
> const struct snd_soc_dapm_route *custom_map;
> int num_routes;
> @@ -301,6 +315,16 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
> dev_err(card->dev, "unable to set MCLK rate\n");
> }
>
> + ret = snd_soc_card_jack_new(runtime->card, "Headset",
> + SND_JACK_HEADSET, &jack,
> + bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins));
> + if (ret) {
> + dev_err(runtime->dev, "Headset jack creation failed %d\n", ret);
> + return ret;
> + }
> +
> + rt5651_set_jack_detect(codec, &jack);
> +
> return ret;
> }
>
>

\
 
 \ /
  Last update: 2017-10-22 17:27    [W:0.256 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site