mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wesley Cheng <quic_wcheng@quicinc.com>
To: <srinivas.kandagatla@linaro.org>, <mathias.nyman@intel.com>,
	<perex@perex.cz>, <conor+dt@kernel.org>, <corbet@lwn.net>,
	<gregkh@linuxfoundation.org>, <lgirdwood@gmail.com>,
	<andersson@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
	<konrad.dybcio@linaro.org>, <Thinh.Nguyen@synopsys.com>,
	<broonie@kernel.org>, <bgoswami@quicinc.com>, <tiwai@suse.com>,
	<robh+dt@kernel.org>, <agross@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-sound@vger.kernel.org>, <linux-usb@vger.kernel.org>,
	<linux-arm-msm@vger.kernel.org>, <linux-doc@vger.kernel.org>,
	<alsa-devel@alsa-project.org>,
	Wesley Cheng <quic_wcheng@quicinc.com>
Subject: [PATCH v10 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status
Date: Fri, 15 Dec 2023 13:49:48 -0800	[thread overview]
Message-ID: <20231215214955.12110-35-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20231215214955.12110-1-quic_wcheng@quicinc.com>

The headphone jack framework has a well defined infrastructure for
notifying userspace entities through input devices.  Expose a jack device
that carries information about if an offload capable device is connected.
Applications can further identify specific offloading information through
other SND kcontrols.

Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
 sound/soc/qcom/common.c      | 19 +++++++++++++++++++
 sound/soc/qcom/common.h      |  3 ++-
 sound/soc/qcom/qdsp6/q6usb.c | 20 ++++++++++++++++++++
 sound/soc/qcom/sm8250.c      | 11 ++++++++++-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index 483bbf53a541..2645436b08c4 100644
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -5,6 +5,7 @@
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <linux/module.h>
 #include <sound/jack.h>
+#include <sound/soc-usb.h>
 #include <linux/input-event-codes.h>
 #include "common.h"
 
@@ -239,4 +240,22 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
 	return 0;
 }
 EXPORT_SYMBOL_GPL(qcom_snd_wcd_jack_setup);
+
+int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
+			    struct snd_soc_jack *jack, bool *jack_setup)
+{
+	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+
+	if (cpu_dai->id != USB_RX)
+		return 0;
+
+	if (!*jack_setup)
+		snd_soc_usb_setup_offload_jack(codec_dai->component, jack);
+
+	*jack_setup = true;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_snd_usb_offload_jack_setup);
 MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h
index d7f80ee5ae26..fca3046c8674 100644
--- a/sound/soc/qcom/common.h
+++ b/sound/soc/qcom/common.h
@@ -9,5 +9,6 @@
 int qcom_snd_parse_of(struct snd_soc_card *card);
 int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
 			    struct snd_soc_jack *jack, bool *jack_setup);
-
+int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
+			    struct snd_soc_jack *jack, bool *jack_setup);
 #endif
diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index fd4da457d834..f1d25d53e8db 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 
 #include <sound/asound.h>
+#include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/q6usboffload.h>
@@ -38,6 +39,7 @@ struct q6usb_status {
 struct q6usb_port_data {
 	struct q6afe_usb_cfg usb_cfg;
 	struct snd_soc_usb *usb;
+	struct snd_soc_jack *hs_jack;
 	struct q6usb_offload priv;
 	struct mutex mutex;
 	unsigned long available_card_slot;
@@ -245,6 +247,9 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
 
 	mutex_lock(&data->mutex);
 	if (connected) {
+		if (!data->available_card_slot)
+			snd_jack_report(data->hs_jack->jack, 1);
+
 		/*
 		 * Update the latest USB headset plugged in, if session is
 		 * idle.
@@ -267,12 +272,26 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
 					ffs(data->available_card_slot) - 1 : 0;
 			data->sel_pcm_idx = 0;
 		}
+
+		if (!data->available_card_slot)
+			snd_jack_report(data->hs_jack->jack, 0);
 	}
 	mutex_unlock(&data->mutex);
 
 	return 0;
 }
 
+static int q6usb_component_set_jack(struct snd_soc_component *component,
+			struct snd_soc_jack *jack, void *data)
+{
+	struct q6usb_port_data *priv = dev_get_drvdata(component->dev);
+
+	priv->hs_jack = jack;
+	snd_jack_report(jack->jack, priv->available_card_slot ? 1 : 0);
+
+	return 0;
+}
+
 static int q6usb_component_probe(struct snd_soc_component *component)
 {
 	struct q6usb_port_data *data = dev_get_drvdata(component->dev);
@@ -313,6 +332,7 @@ static void q6usb_component_remove(struct snd_soc_component *component)
 
 static const struct snd_soc_component_driver q6usb_dai_component = {
 	.probe = q6usb_component_probe,
+	.set_jack = q6usb_component_set_jack,
 	.remove = q6usb_component_remove,
 	.name = "q6usb-dai-component",
 	.dapm_widgets = q6usb_dai_widgets,
diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
index 9cc869fd70ac..c33a7c5fb8ad 100644
--- a/sound/soc/qcom/sm8250.c
+++ b/sound/soc/qcom/sm8250.c
@@ -22,14 +22,23 @@ struct sm8250_snd_data {
 	struct snd_soc_card *card;
 	struct sdw_stream_runtime *sruntime[AFE_PORT_MAX];
 	struct snd_soc_jack jack;
+	struct snd_soc_jack usb_offload_jack;
+	bool usb_offload_jack_setup;
 	bool jack_setup;
 };
 
 static int sm8250_snd_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+	int ret;
 
-	return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
+	if (cpu_dai->id == USB_RX)
+		ret = qcom_snd_usb_offload_jack_setup(rtd, &data->usb_offload_jack,
+						&data->usb_offload_jack_setup);
+	else
+		ret = qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
+	return ret;
 }
 
 static int sm8250_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

  parent reply	other threads:[~2023-12-15 21:50 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-15 21:49 [PATCH v10 00/41] Introduce QC USB SND audio offloading support Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 01/41] xhci: add support to allocate several interrupters Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 02/41] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 03/41] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 04/41] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 05/41] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 06/41] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 07/41] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 08/41] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 09/41] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 10/41] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 11/41] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 12/41] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 13/41] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 14/41] dt-bindings: usb: xhci: Add num-hc-interrupters definition Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 15/41] dt-bindings: usb: dwc3: Limit " Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 16/41] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 17/41] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 18/41] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2023-12-15 22:38   ` Jeff Johnson
2023-12-18 19:58     ` Wesley Cheng
2023-12-19 12:01   ` Konrad Dybcio
2023-12-19 12:01     ` Konrad Dybcio
2023-12-15 21:49 ` [PATCH v10 19/41] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 20/41] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 21/41] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 22/41] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 23/41] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 24/41] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 25/41] ASoC: dt-bindings: Add Q6USB backend Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 26/41] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 27/41] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 29/41] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 30/41] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 31/41] ASoC: Add SND kcontrol for fetching USB offload status Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 32/41] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 33/41] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2023-12-15 21:49 ` Wesley Cheng [this message]
2023-12-15 21:49 ` [PATCH v10 35/41] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 36/41] ALSA: usb-audio: mixer: Add USB offloading mixer control Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 37/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 38/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 39/41] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 40/41] ASoC: qcom: Populate SoC components string Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 41/41] ASoC: doc: Add documentation for SOC USB Wesley Cheng

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=20231215214955.12110-35-quic_wcheng@quicinc.com \
    --to=quic_wcheng@quicinc.com \
    --cc=Thinh.Nguyen@synopsys.com \
    --cc=agross@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=andersson@kernel.org \
    --cc=bgoswami@quicinc.com \
    --cc=broonie@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mathias.nyman@intel.com \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=srinivas.kandagatla@linaro.org \
    --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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®