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>,
<lgirdwood@gmail.com>, <andersson@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <gregkh@linuxfoundation.org>,
<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
<bgoswami@quicinc.com>, <tiwai@suse.com>, <robh@kernel.org>,
<konrad.dybcio@linaro.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 v20 40/41] ASoC: qcom: Populate SoC components string
Date: Thu, 25 Apr 2024 14:51:24 -0700 [thread overview]
Message-ID: <20240425215125.29761-41-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240425215125.29761-1-quic_wcheng@quicinc.com>
For userspace to know about certain capabilities of the current platform
card, add tags to the components string that it can use to enable support
for that audio path. In case of USB offloading, the "usboffldplybk: 1" tag
is added to the string.
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
sound/soc/qcom/sm8250.c | 3 +++
sound/soc/qcom/usb_offload_utils.c | 22 ++++++++++++++++++++++
sound/soc/qcom/usb_offload_utils.h | 6 ++++++
3 files changed, 31 insertions(+)
diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
index a4e87dfb1b93..5e3007e2e061 100644
--- a/sound/soc/qcom/sm8250.c
+++ b/sound/soc/qcom/sm8250.c
@@ -39,6 +39,9 @@ static int sm8250_snd_init(struct snd_soc_pcm_runtime *rtd)
&data->usb_offload_jack_setup);
else
ret = qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
+
+ qcom_snd_add_components_string(rtd);
+
return ret;
}
diff --git a/sound/soc/qcom/usb_offload_utils.c b/sound/soc/qcom/usb_offload_utils.c
index 0be05c1f87a9..8b137e1593e5 100644
--- a/sound/soc/qcom/usb_offload_utils.c
+++ b/sound/soc/qcom/usb_offload_utils.c
@@ -26,4 +26,26 @@ int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
return 0;
}
EXPORT_SYMBOL_GPL(qcom_snd_usb_offload_jack_setup);
+
+int qcom_snd_add_components_string(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ struct snd_soc_card *card = rtd->card;
+ const char *prev = card->components;
+
+ switch (cpu_dai->id) {
+ case USB_RX:
+ card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s %s",
+ card->components,
+ snd_soc_usb_get_components_tag(true));
+ default:
+ break;
+ }
+
+ if (prev && prev != card->components)
+ devm_kfree(card->dev, prev);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_snd_add_components_string);
MODULE_LICENSE("GPL");
diff --git a/sound/soc/qcom/usb_offload_utils.h b/sound/soc/qcom/usb_offload_utils.h
index 283e81f57f43..03780a12a326 100644
--- a/sound/soc/qcom/usb_offload_utils.h
+++ b/sound/soc/qcom/usb_offload_utils.h
@@ -10,11 +10,17 @@
#if IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS)
int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_jack *jack, bool *jack_setup);
+int qcom_snd_add_components_string(struct snd_soc_pcm_runtime *rtd);
#else
static inline int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_jack *jack, bool *jack_setup)
{
return -ENODEV;
}
+
+static inline int qcom_snd_add_components_string(struct snd_soc_pcm_runtime *rtd)
+{
+ return -ENODEV;
+}
#endif /* IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) */
#endif /* __QCOM_SND_USB_OFFLOAD_UTILS_H__ */
next prev parent reply other threads:[~2024-04-25 21:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 21:50 [PATCH v20 00/41] Introduce QC USB SND audio offloading support Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 01/41] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 02/41] usb: host: xhci: Export enable and disable interrupter APIs Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 03/41] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-04-30 11:02 ` Mathias Nyman
2024-04-30 21:57 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 04/41] xhci: export XHCI IMOD setting helper for interrupters Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 05/41] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 06/41] usb: host: xhci-sideband: Expose a sideband interrupter enable API Wesley Cheng
2024-05-02 11:07 ` Mathias Nyman
2024-05-02 23:37 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 07/41] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 08/41] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-04-26 13:24 ` Amadeusz Sławiński
2024-04-26 20:03 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 09/41] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-26 21:55 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 10/41] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 11/41] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 12/41] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 13/41] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 14/41] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 15/41] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 16/41] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 17/41] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 18/41] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 19/41] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 20/41] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 21/41] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 22/41] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-30 8:01 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 23/41] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 24/41] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 25/41] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 26/41] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 27/41] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 29/41] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 30/41] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 31/41] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 32/41] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 33/41] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-04-26 13:26 ` Amadeusz Sławiński
2024-05-01 0:32 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 35/41] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 36/41] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 37/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 38/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 39/41] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-04-25 21:51 ` Wesley Cheng [this message]
2024-04-25 21:51 ` [PATCH v20 41/41] ASoC: doc: Add documentation for SOC USB Wesley Cheng
2024-04-26 3:36 ` Bagas Sanjaya
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=20240425215125.29761-41-quic_wcheng@quicinc.com \
--to=quic_wcheng@quicinc.com \
--cc=Thinh.Nguyen@synopsys.com \
--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@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 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.