On 03/12/2021 12:06, Srinivasa Rao Mandadapu wrote:
From: Srinivasa Rao Mandadapu srivasam@codeaurora.org
Add new machine driver to register sound card on sc7280 based targets and do the required configuration for lpass cpu dai and external codecs connected over MI2S and soundwire interfaces. Add support for audio jack detection, soundwire init and MBHC.
Signed-off-by: Srinivasa Rao Mandadapu srivasam@codeaurora.org
sound/soc/qcom/Kconfig | 14 +++ sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass.h | 1 + sound/soc/qcom/sc7280.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+) create mode 100644 sound/soc/qcom/sc7280.c
Overall it looks good, but few nits below.
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index cc7c1de..932b082 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -152,4 +152,18 @@ config SND_SOC_SC7180 SC7180 SoC-based systems. Say Y if you want to use audio device on this SoCs.
+config SND_SOC_SC7280
- tristate "SoC Machine driver for SC7280 boards"
- depends on I2C && SOUNDWIRE || COMPILE_TEST
- select SND_SOC_QCOM_COMMON
- select SND_SOC_LPASS_SC7280
- select SND_SOC_MAX98357A
- select SND_SOC_WCD938X
- select SND_SOC_LPASS_RX_MACRO
- select SND_SOC_LPASS_TX_MACRO
- help
Add support for audio on Qualcomm Technologies Inc.SC7280 SoC-based systems.Say Y or M if you want to use audio device on this SoCs.- endif #SND_SOC_QCOM
diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile index 1600ae5..625aec6 100644 --- a/sound/soc/qcom/Makefile +++ b/sound/soc/qcom/Makefile @@ -19,6 +19,7 @@ snd-soc-storm-objs := storm.o snd-soc-apq8016-sbc-objs := apq8016_sbc.o snd-soc-apq8096-objs := apq8096.o 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-qcom-common-objs := common.o @@ -27,6 +28,7 @@ obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o 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_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/lpass.h b/sound/soc/qcom/lpass.h index 67ef497..c0f0247 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -16,6 +16,7 @@ #include "lpass-hdmi.h"
#define LPASS_AHBIX_CLOCK_FREQUENCY 131072000 +#define LPASS_MAX_PORTS (LPASS_CDC_DMA_VA_TX8 + 1)
This change does not really belong in this patch, can you move this into a separate patch?
#define LPASS_MAX_MI2S_PORTS (8) #define LPASS_MAX_DMA_CHANNELS (8) #define LPASS_MAX_HDMI_DMA_CHANNELS (4) diff --git a/sound/soc/qcom/sc7280.c b/sound/soc/qcom/sc7280.c new file mode 100644 index 0000000..31a77eb --- /dev/null +++ b/sound/soc/qcom/sc7280.c @@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. +// +// ALSA SoC Machine driver for sc7280
+#include <linux/input.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <linux/soundwire/sdw.h>
...
+static const struct snd_soc_ops sc7280_ops = {
- .hw_params = sc7280_snd_hw_params,
- .hw_free = sc7280_snd_hw_free,
- .prepare = sc7280_snd_prepare,
+};
+static const struct snd_soc_dapm_widget sc7280_snd_widgets[] = {
- SND_SOC_DAPM_HP("Headphone Jack", NULL),
- SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
This is not used anywhere in the file.
+static int sc7280_snd_platform_probe(struct platform_device *pdev) +{
- struct snd_soc_card *card;
- struct sc7280_snd_data *data;
- struct device *dev = &pdev->dev;
- struct snd_soc_dai_link *link;
- int ret, i;
- data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
- if (!data)
return -ENOMEM;- card = &data->card;
- snd_soc_card_set_drvdata(card, data);
- card->owner = THIS_MODULE;
- card->driver_name = "SC7280";
- card->dev = dev;
- ret = qcom_snd_parse_of(card);
- if (ret)
return ret;- for_each_card_prelinks(card, i, link) {
link->init = sc7280_init;link->ops = &sc7280_ops;- }
- return devm_snd_soc_register_card(dev, card);
+}
+static const struct of_device_id sc7280_snd_device_id[] = {
- { .compatible = "google,sc7280-herobrine" },
- {}
+}; +MODULE_DEVICE_TABLE(of, sc7280_snd_device_id);
+static struct platform_driver sc7280_snd_driver = {
- .probe = sc7280_snd_platform_probe,
- .driver = {
.name = "msm-snd-sc7280",.of_match_table = sc7280_snd_device_id,.pm = &snd_soc_pm_ops,- },
+}; +module_platform_driver(sc7280_snd_driver);
+MODULE_DESCRIPTION("sc7280 ASoC Machine Driver"); +MODULE_LICENSE("GPL");