]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: Intel: avs: Add rt5640 machine board
authorCezary Rojewski <cezary.rojewski@intel.com>
Fri, 30 May 2025 14:21:20 +0000 (16:21 +0200)
committerMark Brown <broonie@kernel.org>
Sun, 8 Jun 2025 22:34:38 +0000 (23:34 +0100)
To support connection between Intel AudioDSP and Realek 5640 codec
implement avs_rt5640 machine board driver. The codec chip is located on
I2C bus and the streaming occurs over I2S interface. A number of such
devices can be connected simultaneously to the platform. Majority of the
board's behavior is inherited from existing representatives such as
avs_rt274.

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250530142120.2944095-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/avs/board_selection.c
sound/soc/intel/avs/boards/Kconfig
sound/soc/intel/avs/boards/Makefile
sound/soc/intel/avs/boards/rt5640.c [new file with mode: 0644]

index 673ccf16202302d54592a0f5dfd80e9818709090..fb49167f5fc4ba4ed3581b3b58d5d156c4aee4aa 100644 (file)
@@ -308,6 +308,33 @@ static struct snd_soc_acpi_mach avs_tgl_i2s_machines[] = {
                },
                .tplg_filename = "rt1308-tplg.bin",
        },
+       {
+               .id = "10EC5640",
+               .uid = "1",
+               .drv_name = "avs_rt5640",
+               .mach_params = {
+                       .i2s_link_mask = AVS_SSP(0),
+               },
+               .tplg_filename = "rt5640-tplg.bin",
+       },
+       {
+               .id = "10EC5640",
+               .uid = "3",
+               .drv_name = "avs_rt5640",
+               .mach_params = {
+                       .i2s_link_mask = AVS_SSP(1),
+               },
+               .tplg_filename = "rt5640-tplg.bin",
+       },
+       {
+               .id = "10EC5640",
+               .uid = "2",
+               .drv_name = "avs_rt5640",
+               .mach_params = {
+                       .i2s_link_mask = AVS_SSP(2),
+               },
+               .tplg_filename = "rt5640-tplg.bin",
+       },
        {
                .id = "ESSX8336",
                .drv_name = "avs_es8336",
index 8b654181004e7f2154918248095653f14215db76..82f50207bb2ff0ca033cb1b360fd753b1cdd79fb 100644 (file)
@@ -153,6 +153,18 @@ config SND_SOC_INTEL_AVS_MACH_RT5514
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
+config SND_SOC_INTEL_AVS_MACH_RT5640
+       tristate "rt5640 in I2S mode"
+       depends on I2C
+       depends on MFD_INTEL_LPSS || COMPILE_TEST
+       select SND_SOC_RT5640
+       help
+         This adds support for ASoC machine board connecting AVS with RT5640,
+         components representing Intel AudioDSP and Realtek 5640 codec respectively.
+         The codec chip is present on I2C bus and the streaming occurs over I2S
+         interface.
+         Say Y or m if you have such a device.
+
 config SND_SOC_INTEL_AVS_MACH_RT5663
        tristate "rt5663 in I2S mode"
        depends on I2C
index a95256b94dc8bbb29789fad1804f3f7c692d85f7..46ef1babda34b1ae6e5874a8244d450a613ead36 100644 (file)
@@ -15,6 +15,7 @@ snd-soc-avs-rt274-y := rt274.o
 snd-soc-avs-rt286-y := rt286.o
 snd-soc-avs-rt298-y := rt298.o
 snd-soc-avs-rt5514-y := rt5514.o
+snd-soc-avs-rt5640-y := rt5640.o
 snd-soc-avs-rt5663-y := rt5663.o
 snd-soc-avs-rt5682-y := rt5682.o
 snd-soc-avs-ssm4567-y := ssm4567.o
@@ -34,6 +35,7 @@ obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT274) += snd-soc-avs-rt274.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT286) += snd-soc-avs-rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT298) += snd-soc-avs-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514) += snd-soc-avs-rt5514.o
+obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640) += snd-soc-avs-rt5640.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663) += snd-soc-avs-rt5663.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682) += snd-soc-avs-rt5682.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567) += snd-soc-avs-ssm4567.o
diff --git a/sound/soc/intel/avs/boards/rt5640.c b/sound/soc/intel/avs/boards/rt5640.c
new file mode 100644 (file)
index 0000000..706b84f
--- /dev/null
@@ -0,0 +1,270 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright(c) 2022-2025 Intel Corporation
+//
+// Authors: Cezary Rojewski <cezary.rojewski@intel.com>
+//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
+//
+
+#include <linux/module.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include "../../../codecs/rt5640.h"
+#include "../utils.h"
+
+#define AVS_RT5640_MCLK_HZ             19200000
+#define RT5640_CODEC_DAI               "rt5640-aif1"
+
+static const struct snd_soc_dapm_widget card_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_MIC("Mic Jack", NULL),
+       SND_SOC_DAPM_SPK("Speaker", NULL),
+};
+
+static const struct snd_soc_dapm_route card_routes[] = {
+       { "Headphone Jack", NULL, "HPOR" },
+       { "Headphone Jack", NULL, "HPOL" },
+       { "IN2P", NULL, "Mic Jack" },
+       { "IN2P", NULL, "MICBIAS1" },
+       { "Speaker", NULL, "SPOLP" },
+       { "Speaker", NULL, "SPOLN" },
+       { "Speaker", NULL, "SPORP" },
+       { "Speaker", NULL, "SPORN" },
+};
+
+static const struct snd_soc_jack_pin card_headset_pins[] = {
+       {
+               .pin = "Headphone Jack",
+               .mask = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin = "Mic Jack",
+               .mask = SND_JACK_MICROPHONE,
+       },
+};
+
+static int avs_rt5640_codec_init(struct snd_soc_pcm_runtime *runtime)
+{
+       struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0);
+       struct snd_soc_card *card = runtime->card;
+       struct snd_soc_jack_pin *pins;
+       struct snd_soc_jack *jack;
+       int num_pins, ret;
+
+       jack = snd_soc_card_get_drvdata(card);
+       num_pins = ARRAY_SIZE(card_headset_pins);
+
+       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       if (!pins)
+               return -ENOMEM;
+
+       ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET, jack, pins,
+                                        num_pins);
+       if (ret)
+               return ret;
+
+       snd_soc_component_set_jack(codec_dai->component, jack, NULL);
+       card->dapm.idle_bias_off = true;
+
+       return 0;
+}
+
+static void avs_rt5640_codec_exit(struct snd_soc_pcm_runtime *runtime)
+{
+       struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0);
+
+       snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
+}
+
+static int avs_rt5640_be_fixup(struct snd_soc_pcm_runtime *runtime,
+                              struct snd_pcm_hw_params *params)
+{
+       struct snd_mask *fmask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+
+       /* Format 24/32 is MSB-aligned for HDAudio and LSB-aligned for I2S. */
+       if (params_format(params) == SNDRV_PCM_FORMAT_S32_LE)
+               snd_mask_set_format(fmask, SNDRV_PCM_FORMAT_S24_LE);
+
+       return 0;
+}
+
+static int avs_rt5640_hw_params(struct snd_pcm_substream *substream,
+                               struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *runtime = snd_soc_substream_to_rtd(substream);
+       struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(runtime, 0);
+       int ret;
+
+       ret = snd_soc_dai_set_pll(codec_dai, 0, RT5640_PLL1_S_MCLK, AVS_RT5640_MCLK_HZ,
+                                 params_rate(params) * 512);
+       if (ret < 0) {
+               dev_err(runtime->dev, "Set codec PLL failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_PLL1, params_rate(params) * 512,
+                                    SND_SOC_CLOCK_IN);
+       if (ret < 0) {
+               dev_err(runtime->dev, "Set codec SCLK failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = rt5640_sel_asrc_clk_src(codec_dai->component,
+                                     RT5640_DA_STEREO_FILTER | RT5640_AD_STEREO_FILTER |
+                                     RT5640_DA_MONO_L_FILTER | RT5640_DA_MONO_R_FILTER |
+                                     RT5640_AD_MONO_L_FILTER | RT5640_AD_MONO_R_FILTER,
+                                     RT5640_CLK_SEL_ASRC);
+       if (ret)
+               dev_err(runtime->dev, "Set codec ASRC failed: %d\n", ret);
+
+       return ret;
+}
+
+static const struct snd_soc_ops avs_rt5640_ops = {
+       .hw_params = avs_rt5640_hw_params,
+};
+
+static int avs_create_dai_link(struct device *dev, int ssp_port, int tdm_slot,
+                              struct snd_soc_acpi_mach *mach,
+                              struct snd_soc_dai_link **dai_link)
+{
+       struct snd_soc_dai_link_component *platform;
+       struct snd_soc_dai_link *dl;
+       u32 uid = 0;
+       int ret;
+
+       if (mach->uid) {
+               ret = kstrtou32(mach->uid, 0, &uid);
+               if (ret)
+                       return ret;
+               uid--; /* 0-based indexing. */
+       }
+
+       dl = devm_kzalloc(dev, sizeof(*dl), GFP_KERNEL);
+       platform = devm_kzalloc(dev, sizeof(*platform), GFP_KERNEL);
+       if (!dl || !platform)
+               return -ENOMEM;
+
+       dl->name = devm_kasprintf(dev, GFP_KERNEL,
+                                 AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));
+       dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
+       dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs), GFP_KERNEL);
+       if (!dl->name || !dl->cpus || !dl->codecs)
+               return -ENOMEM;
+
+       dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
+                                           AVS_STRING_FMT("SSP", " Pin", ssp_port, tdm_slot));
+       dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-10EC5640:0%d", uid);
+       dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, RT5640_CODEC_DAI);
+       if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
+               return -ENOMEM;
+
+       platform->name = dev_name(dev);
+       dl->num_cpus = 1;
+       dl->num_codecs = 1;
+       dl->platforms = platform;
+       dl->num_platforms = 1;
+       dl->id = 0;
+       dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
+       dl->init = avs_rt5640_codec_init;
+       dl->exit = avs_rt5640_codec_exit;
+       dl->be_hw_params_fixup = avs_rt5640_be_fixup;
+       dl->ops = &avs_rt5640_ops;
+       dl->nonatomic = 1;
+       dl->no_pcm = 1;
+
+       *dai_link = dl;
+
+       return 0;
+}
+
+static int avs_card_suspend_pre(struct snd_soc_card *card)
+{
+       struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT5640_CODEC_DAI);
+
+       return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
+}
+
+static int avs_card_resume_post(struct snd_soc_card *card)
+{
+       struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT5640_CODEC_DAI);
+       struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
+
+       return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
+}
+
+static int avs_rt5640_probe(struct platform_device *pdev)
+{
+       struct snd_soc_dai_link *dai_link;
+       struct device *dev = &pdev->dev;
+       struct snd_soc_acpi_mach *mach;
+       struct snd_soc_card *card;
+       struct snd_soc_jack *jack;
+       int ssp_port, tdm_slot, ret;
+
+       mach = dev_get_platdata(dev);
+
+       ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);
+       if (ret)
+               return ret;
+
+       ret = avs_create_dai_link(dev, ssp_port, tdm_slot, mach, &dai_link);
+       if (ret) {
+               dev_err(dev, "Failed to create dai link: %d", ret);
+               return ret;
+       }
+
+       jack = devm_kzalloc(dev, sizeof(*jack), GFP_KERNEL);
+       card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+       if (!jack || !card)
+               return -ENOMEM;
+
+       if (mach->uid) {
+               card->name = devm_kasprintf(dev, GFP_KERNEL, "AVS I2S ALC5640.%s", mach->uid);
+               if (!card->name)
+                       return -ENOMEM;
+       } else {
+               card->name = "AVS I2S ALC5640";
+       }
+       card->driver_name = "avs_rt5640";
+       card->long_name = card->name;
+       card->dev = dev;
+       card->owner = THIS_MODULE;
+       card->suspend_pre = avs_card_suspend_pre;
+       card->resume_post = avs_card_resume_post;
+       card->dai_link = dai_link;
+       card->num_links = 1;
+       card->dapm_widgets = card_widgets;
+       card->num_dapm_widgets = ARRAY_SIZE(card_widgets);
+       card->dapm_routes = card_routes;
+       card->num_dapm_routes = ARRAY_SIZE(card_routes);
+       card->fully_routed = true;
+       snd_soc_card_set_drvdata(card, jack);
+
+       return devm_snd_soc_register_deferrable_card(dev, card);
+}
+
+static const struct platform_device_id avs_rt5640_driver_ids[] = {
+       {
+               .name = "avs_rt5640",
+       },
+       {},
+};
+MODULE_DEVICE_TABLE(platform, avs_rt5640_driver_ids);
+
+static struct platform_driver avs_rt5640_driver = {
+       .probe = avs_rt5640_probe,
+       .driver = {
+               .name = "avs_rt5640",
+               .pm = &snd_soc_pm_ops,
+       },
+       .id_table = avs_rt5640_driver_ids,
+};
+
+module_platform_driver(avs_rt5640_driver);
+
+MODULE_DESCRIPTION("Intel rt5640 machine driver");
+MODULE_LICENSE("GPL");