lkml.org 
[lkml]   [2024]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v18 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status
    Date
    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/Kconfig | 5 +++++
    sound/soc/qcom/Makefile | 2 ++
    sound/soc/qcom/qdsp6/q6usb.c | 20 ++++++++++++++++++++
    sound/soc/qcom/sm8250.c | 12 +++++++++++-
    sound/soc/qcom/usb_offload_utils.c | 29 +++++++++++++++++++++++++++++
    sound/soc/qcom/usb_offload_utils.h | 20 ++++++++++++++++++++
    6 files changed, 87 insertions(+), 1 deletion(-)
    create mode 100644 sound/soc/qcom/usb_offload_utils.c
    create mode 100644 sound/soc/qcom/usb_offload_utils.h

    diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
    index a1beafe2b1dd..e5284a93cf9a 100644
    --- a/sound/soc/qcom/Kconfig
    +++ b/sound/soc/qcom/Kconfig
    @@ -118,9 +118,14 @@ config SND_SOC_QDSP6_PRM
    tristate
    select SND_SOC_QDSP6_PRM_LPASS_CLOCKS

    +config SND_SOC_QCOM_OFFLOAD_UTILS
    + tristate
    +
    config SND_SOC_QDSP6_USB
    tristate "SoC ALSA USB offloading backing for QDSP6"
    depends on SND_SOC_USB
    + select SND_SOC_QCOM_OFFLOAD_UTILS
    +
    help
    Adds support for USB offloading for QDSP6 ASoC
    based platform sound cards. This will enable the
    diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
    index 34f3fcb8ee9a..001c287df777 100644
    --- a/sound/soc/qcom/Makefile
    +++ b/sound/soc/qcom/Makefile
    @@ -30,6 +30,7 @@ snd-soc-sc8280xp-objs := sc8280xp.o
    snd-soc-qcom-common-objs := common.o
    snd-soc-qcom-sdw-objs := sdw.o
    snd-soc-x1e80100-objs := x1e80100.o
    +snd-soc-qcom-offload-utils-objs := usb_offload_utils.o

    obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
    obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
    @@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_SM8250) += snd-soc-sm8250.o
    obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
    obj-$(CONFIG_SND_SOC_QCOM_SDW) += snd-soc-qcom-sdw.o
    obj-$(CONFIG_SND_SOC_X1E80100) += snd-soc-x1e80100.o
    +obj-$(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) += snd-soc-qcom-offload-utils.o

    #DSP lib
    obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/
    diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
    index 32971395ab13..c62416215e83 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;
    @@ -252,6 +254,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.
    @@ -274,12 +279,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);
    @@ -320,6 +339,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 d70df72c0160..a4e87dfb1b93 100644
    --- a/sound/soc/qcom/sm8250.c
    +++ b/sound/soc/qcom/sm8250.c
    @@ -12,6 +12,7 @@
    #include <linux/input-event-codes.h>
    #include "qdsp6/q6afe.h"
    #include "common.h"
    +#include "usb_offload_utils.h"
    #include "sdw.h"

    #define DRIVER_NAME "sm8250"
    @@ -22,14 +23,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,
    diff --git a/sound/soc/qcom/usb_offload_utils.c b/sound/soc/qcom/usb_offload_utils.c
    new file mode 100644
    index 000000000000..0be05c1f87a9
    --- /dev/null
    +++ b/sound/soc/qcom/usb_offload_utils.c
    @@ -0,0 +1,29 @@
    +// SPDX-License-Identifier: GPL-2.0
    +/*
    + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +#include <dt-bindings/sound/qcom,q6afe.h>
    +#include <linux/module.h>
    +#include <sound/jack.h>
    +#include <sound/soc-usb.h>
    +
    +#include "usb_offload_utils.h"
    +
    +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");
    diff --git a/sound/soc/qcom/usb_offload_utils.h b/sound/soc/qcom/usb_offload_utils.h
    new file mode 100644
    index 000000000000..283e81f57f43
    --- /dev/null
    +++ b/sound/soc/qcom/usb_offload_utils.h
    @@ -0,0 +1,20 @@
    +/* SPDX-License-Identifier: GPL-2.0
    + *
    + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +#ifndef __QCOM_SND_USB_OFFLOAD_UTILS_H__
    +#define __QCOM_SND_USB_OFFLOAD_UTILS_H__
    +
    +#include <sound/soc.h>
    +
    +#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);
    +#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;
    +}
    +#endif /* IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) */
    +#endif /* __QCOM_SND_USB_OFFLOAD_UTILS_H__ */
    \
     
     \ /
      Last update: 2024-05-27 15:25    [W:4.550 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site