]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: intel: sof_sdw: add rt1318 codec support.
authorGongjun Song <gongjun.song@intel.com>
Mon, 12 Dec 2022 08:48:52 +0000 (16:48 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Thu, 9 Mar 2023 14:58:15 +0000 (15:58 +0100)
BugLink: https://bugs.launchpad.net/bugs/1997944
Add rt1318 sdca codec support in sof_sdw machine driver.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221117002758.496211-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 8c4b3a8ea2c04d7979f378165e5c3dfa270659b6 linux-next)
Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
sound/soc/intel/boards/Makefile
sound/soc/intel/boards/sof_sdw.c
sound/soc/intel/boards/sof_sdw_common.h
sound/soc/intel/boards/sof_sdw_rt1318.c [new file with mode: 0644]

index d1fd7a2b32dbca27df868dbc1e3a61ca1735930d..98111db75046c0fa9673a9b6bd0f88bf3735f4d1 100644 (file)
@@ -38,6 +38,7 @@ snd-soc-ehl-rt5660-objs := ehl_rt5660.o
 snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o
 snd-soc-sof-sdw-objs += sof_sdw.o                              \
                        sof_sdw_max98373.o sof_sdw_rt_amp.o     \
+                       sof_sdw_rt1318.o                        \
                        sof_sdw_rt5682.o sof_sdw_rt700.o        \
                        sof_sdw_rt711.o sof_sdw_rt711_sdca.o    \
                        sof_sdw_rt715.o sof_sdw_rt715_sdca.o    \
index 05ae13cc6595d8f1bc4ba76ce6d373d154fd9e39..2062d0e10ec6337c221f9a8175022e603596beb7 100644 (file)
@@ -629,6 +629,13 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                .init = sof_sdw_rt_amp_init,
                .codec_type = SOF_SDW_CODEC_TYPE_AMP,
        },
+       {
+               .part_id = 0x1318,
+               .direction = {true, true},
+               .dai_name = "rt1318-aif",
+               .init = sof_sdw_rt1318_init,
+               .codec_type = SOF_SDW_CODEC_TYPE_AMP,
+       },
        {
                .part_id = 0x714,
                .version_id = 3,
index 350010b0e5f4f1d9d999c42c1bfdd00fd8181ced..f048094fb8be8895d6eb9637f113aa7aab5cbaf3 100644 (file)
@@ -138,6 +138,13 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_
 
 /* RT1316 support */
 
+/* RT1318 support */
+int sof_sdw_rt1318_init(struct snd_soc_card *card,
+                       const struct snd_soc_acpi_link_adr *link,
+                       struct snd_soc_dai_link *dai_links,
+                       struct sof_sdw_codec_info *info,
+                       bool playback);
+
 /* RT715 support */
 int sof_sdw_rt715_init(struct snd_soc_card *card,
                       const struct snd_soc_acpi_link_adr *link,
diff --git a/sound/soc/intel/boards/sof_sdw_rt1318.c b/sound/soc/intel/boards/sof_sdw_rt1318.c
new file mode 100644 (file)
index 0000000..dbee4bf
--- /dev/null
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Copyright (c) 2022 Intel Corporation
+
+/*
+ *  sof_sdw_rt1318 - Helpers to handle RT1318 from generic machine driver
+ */
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <sound/control.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-dapm.h>
+#include "sof_sdw_common.h"
+
+static const struct snd_soc_dapm_widget rt1318_widgets[] = {
+       SND_SOC_DAPM_SPK("Speaker", NULL),
+};
+
+/*
+ * dapm routes for rt1318 will be registered dynamically according
+ * to the number of rt1318 used. The first two entries will be registered
+ * for one codec case, and the last two entries are also registered
+ * if two 1318s are used.
+ */
+static const struct snd_soc_dapm_route rt1318_map[] = {
+       { "Speaker", NULL, "rt1318-1 SPOL" },
+       { "Speaker", NULL, "rt1318-1 SPOR" },
+       { "Speaker", NULL, "rt1318-2 SPOL" },
+       { "Speaker", NULL, "rt1318-2 SPOR" },
+};
+
+static const struct snd_kcontrol_new rt1318_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Speaker"),
+};
+
+static int first_spk_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       int ret;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s spk:rt1318",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_add_card_controls(card, rt1318_controls,
+                                       ARRAY_SIZE(rt1318_controls));
+       if (ret) {
+               dev_err(card->dev, "rt1318 controls addition failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dapm_new_controls(&card->dapm, rt1318_widgets,
+                                       ARRAY_SIZE(rt1318_widgets));
+       if (ret) {
+               dev_err(card->dev, "rt1318 widgets addition failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dapm_add_routes(&card->dapm, rt1318_map, 2);
+       if (ret)
+               dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);
+
+       return ret;
+}
+
+static int second_spk_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       int ret;
+
+       ret = snd_soc_dapm_add_routes(&card->dapm, rt1318_map + 2, 2);
+       if (ret)
+               dev_err(rtd->dev, "failed to add second SPK map: %d\n", ret);
+
+       return ret;
+}
+
+static int all_spk_init(struct snd_soc_pcm_runtime *rtd)
+{
+       int ret;
+
+       ret = first_spk_init(rtd);
+       if (ret)
+               return ret;
+
+       return second_spk_init(rtd);
+}
+
+int sof_sdw_rt1318_init(struct snd_soc_card *card,
+                       const struct snd_soc_acpi_link_adr *link,
+                       struct snd_soc_dai_link *dai_links,
+                       struct sof_sdw_codec_info *info,
+                       bool playback)
+{
+       /* Count amp number and do init on playback link only. */
+       if (!playback)
+               return 0;
+
+       info->amp_num++;
+       if (info->amp_num == 1)
+               dai_links->init = first_spk_init;
+
+       if (info->amp_num == 2) {
+               /*
+                * if two 1318s are in one dai link, the init function
+                * in this dai link will be first set for the first speaker,
+                * and it should be reset to initialize all speakers when
+                * the second speaker is found.
+                */
+               if (dai_links->init)
+                       dai_links->init = all_spk_init;
+               else
+                       dai_links->init = second_spk_init;
+       }
+
+       return 0;
+}