On 06/09/2022 18:55, Srinivas Kandagatla wrote:
> Add machine driver for sc8280xp SoC.
>
> This intial supports only includes WSA883x Speakers and WCD938x based headset.
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
> ---
> sound/soc/qcom/Kconfig | 11 +++
> sound/soc/qcom/Makefile | 2 +
> sound/soc/qcom/sc8280xp.c | 157 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 170 insertions(+)
> create mode 100644 sound/soc/qcom/sc8280xp.c
>
> diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
> index 750653404ba3..d0e59e07b1fc 100644
> --- a/sound/soc/qcom/Kconfig
> +++ b/sound/soc/qcom/Kconfig
> @@ -173,6 +173,17 @@ config SND_SOC_SM8250
> SM8250 SoC-based systems.
> Say Y if you want to use audio device on this SoCs.
>
> +config SND_SOC_SC8280XP
> + tristate "SoC Machine driver for SC8280XP boards"
> + depends on QCOM_APR && SOUNDWIRE
I think APR is not build time dependency, so:
depends on QCOM_APR || COMPILE_TEST
depends on SOUNDWIRE
> + depends on COMMON_CLK
> + select SND_SOC_QDSP6
> + select SND_SOC_QCOM_COMMON
> + help
> + To add support for audio on Qualcomm Technologies Inc.
> + SC8280XP SoC-based systems.
> + Say Y if you want to use audio device on this SoCs.
> +
> config SND_SOC_SC7180
> tristate "SoC Machine driver for SC7180 boards"
> depends on I2C && GPIOLIB
> diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
> index 8b7b876899a8..8b97172cf990 100644
> --- a/sound/soc/qcom/Makefile
> +++ b/sound/soc/qcom/Makefile
> @@ -26,6 +26,7 @@ snd-soc-sc7180-objs := sc7180.o
> snd-soc-sc7280-objs := sc7280.o
> snd-soc-sdm845-objs := sdm845.o
> snd-soc-sm8250-objs := sm8250.o
> +snd-soc-sc8280xp-objs := sc8280xp.o
> snd-soc-qcom-common-objs := common.o
>
> obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
> @@ -33,6 +34,7 @@ obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
> obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o
> obj-$(CONFIG_SND_SOC_SC7180) += snd-soc-sc7180.o
> obj-$(CONFIG_SND_SOC_SC7280) += snd-soc-sc7280.o
> +obj-$(CONFIG_SND_SOC_SC8280XP) += snd-soc-sc8280xp.o
> obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o
> obj-$(CONFIG_SND_SOC_SM8250) += snd-soc-sm8250.o
> obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
> diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c
> new file mode 100644
> index 000000000000..ade44ad7c585
> --- /dev/null
> +++ b/sound/soc/qcom/sc8280xp.c
> @@ -0,0 +1,157 @@
> +// SPDX-License-Identifier: GPL-2.0
> +// Copyright (c) 2022, Linaro Limited
> +
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/of_device.h>
> +#include <sound/soc.h>
> +#include <sound/soc-dapm.h>
> +#include <sound/pcm.h>
> +#include <linux/soundwire/sdw.h>
> +#include <sound/jack.h>
> +#include <linux/input-event-codes.h>
> +#include "qdsp6/q6afe.h"
> +#include "common.h"
> +
> +#define DRIVER_NAME "sc8280xp"
> +
> +struct sc8280xp_snd_data {
> + bool stream_prepared[AFE_PORT_MAX];
> + struct snd_soc_card *card;
> + struct sdw_stream_runtime *sruntime[AFE_PORT_MAX];
> + struct snd_soc_jack jack;
> + bool jack_setup;
> +};
> +
> +static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd)
> +{
> + struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
> +
> + return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
> +}
> +
> +static int sc8280xp_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
> + struct snd_pcm_hw_params *params)
> +{
> + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
> + struct snd_interval *rate = hw_param_interval(params,
> + SNDRV_PCM_HW_PARAM_RATE);
> + struct snd_interval *channels = hw_param_interval(params,
> + SNDRV_PCM_HW_PARAM_CHANNELS);
> +
> + rate->min = rate->max = 48000;
> + channels->min = 2;
> + channels->max = 2;
> + switch (cpu_dai->id) {
> + case TX_CODEC_DMA_TX_0:
> + case TX_CODEC_DMA_TX_1:
> + case TX_CODEC_DMA_TX_2:
> + case TX_CODEC_DMA_TX_3:
> + channels->min = 1;
> + break;
> + default:
> + break;
> + }
> +
> +
Just one blank line.
Best regards,
Krzysztof
