From: Mark Brown <broonie@kernel.org> To: Carlo Caione <carlo@endlessm.com> Cc: Mark Brown <broonie@kernel.org>, linux@endlessm.com, bardliao@realtek.com, oder_chiou@realtek.com, pierre-louis.bossart@linux.intel.com, broonie@kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, tiwai@suse.com, albertchen@realtek.com, edgar_shen@realtek.com, alsa-devel@alsa-project.org Subject: Applied "ASoC: intel: byt: Add headset jack" to the asoc tree Date: Thu, 26 Oct 2017 15:16:50 +0100 (BST) [thread overview] Message-ID: <20171026141650.3D56F44005B@finisterre.ee.mobilebroadband> (raw) In-Reply-To: <20171020111859.2448-3-carlo@caione.org> The patch ASoC: intel: byt: Add headset jack has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 Mon Sep 17 00:00:00 2001 From: Carlo Caione <carlo@endlessm.com> Date: Fri, 20 Oct 2017 12:18:56 +0100 Subject: [PATCH] ASoC: intel: byt: Add headset jack Introduce an headset jack in the machine driver and register it to the codec driver. Signed-off-by: Carlo Caione <carlo@endlessm.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/intel/boards/bytcr_rt5651.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 51de1bbe8ecd..0df9067e4382 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -47,6 +47,7 @@ enum { struct byt_rt5651_private { struct clk *mclk; + struct snd_soc_jack jack; }; static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP | @@ -177,6 +178,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 +256,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 +314,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, &priv->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, &priv->jack); + return ret; } -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Carlo Caione <carlo@endlessm.com> Cc: oder_chiou@realtek.com, alsa-devel@alsa-project.org, edgar_shen@realtek.com, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, linux-kernel@vger.kernel.org, albertchen@realtek.com, broonie@kernel.org, bardliao@realtek.com, linux@endlessm.com Subject: Applied "ASoC: intel: byt: Add headset jack" to the asoc tree Date: Thu, 26 Oct 2017 15:16:50 +0100 (BST) [thread overview] Message-ID: <20171026141650.3D56F44005B@finisterre.ee.mobilebroadband> (raw) In-Reply-To: <20171020111859.2448-3-carlo@caione.org> The patch ASoC: intel: byt: Add headset jack has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 Mon Sep 17 00:00:00 2001 From: Carlo Caione <carlo@endlessm.com> Date: Fri, 20 Oct 2017 12:18:56 +0100 Subject: [PATCH] ASoC: intel: byt: Add headset jack Introduce an headset jack in the machine driver and register it to the codec driver. Signed-off-by: Carlo Caione <carlo@endlessm.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/intel/boards/bytcr_rt5651.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 51de1bbe8ecd..0df9067e4382 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -47,6 +47,7 @@ enum { struct byt_rt5651_private { struct clk *mclk; + struct snd_soc_jack jack; }; static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP | @@ -177,6 +178,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 +256,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 +314,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, &priv->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, &priv->jack); + return ret; } -- 2.14.1
next prev parent reply other threads:[~2017-10-26 14:18 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-20 11:18 [PATCH v2 0/5] rt5651: Enable jack detection Carlo Caione 2017-10-20 11:18 ` [PATCH v2 1/5] ASoC: rt5651: Enable jack detection on JD* pins Carlo Caione 2017-10-26 14:17 ` Applied "ASoC: rt5651: Enable jack detection on JD* pins" to the asoc tree Mark Brown 2017-10-26 14:17 ` Mark Brown 2017-10-26 14:17 ` Mark Brown 2017-10-26 14:17 ` Mark Brown 2017-10-20 11:18 ` [PATCH v2 2/5] ASoC: intel: byt: Add headset jack Carlo Caione 2017-10-26 14:16 ` Mark Brown [this message] 2017-10-26 14:16 ` Applied "ASoC: intel: byt: Add headset jack" to the asoc tree Mark Brown 2017-10-20 11:18 ` [PATCH v2 3/5] ASoC: intel: byt: Enable IN2 map quirk for a KIANO laptop Carlo Caione 2017-10-26 14:16 ` Applied "ASoC: intel: byt: Enable IN2 map quirk for a KIANO laptop" to the asoc tree Mark Brown 2017-10-26 14:16 ` Mark Brown 2017-10-20 11:18 ` [PATCH v2 4/5] ASoC: rt5651: Rework quirk logic Carlo Caione 2017-10-26 14:16 ` Applied "ASoC: rt5651: Rework quirk logic" to the asoc tree Mark Brown 2017-10-26 14:16 ` Mark Brown 2017-10-20 11:18 ` [PATCH v2 5/5] ASoC: rt5651: Enable JD1_1 quirk for KIANO laptopt Carlo Caione 2017-10-26 14:16 ` Applied "ASoC: rt5651: Enable JD1_1 quirk for KIANO laptopt" to the asoc tree Mark Brown 2017-10-26 14:16 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171026141650.3D56F44005B@finisterre.ee.mobilebroadband \ --to=broonie@kernel.org \ --cc=albertchen@realtek.com \ --cc=alsa-devel@alsa-project.org \ --cc=bardliao@realtek.com \ --cc=carlo@endlessm.com \ --cc=edgar_shen@realtek.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@endlessm.com \ --cc=oder_chiou@realtek.com \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.