Commit 8c4b3a8e authored by Gongjun Song's avatar Gongjun Song Committed by Mark Brown

ASoC: intel: sof_sdw: add rt1318 codec support.

Add rt1318 sdca codec support in sof_sdw machine driver.
Signed-off-by: default avatarGongjun Song <gongjun.song@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221117002758.496211-2-yung-chuan.liao@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c7eb967d
...@@ -668,6 +668,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH ...@@ -668,6 +668,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
select SND_SOC_RT1308_SDW select SND_SOC_RT1308_SDW
select SND_SOC_RT1308 select SND_SOC_RT1308
select SND_SOC_RT1316_SDW select SND_SOC_RT1316_SDW
select SND_SOC_RT1318_SDW
select SND_SOC_RT715_SDW select SND_SOC_RT715_SDW
select SND_SOC_RT715_SDCA_SDW select SND_SOC_RT715_SDCA_SDW
select SND_SOC_RT5682_SDW select SND_SOC_RT5682_SDW
......
...@@ -37,8 +37,8 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o ...@@ -37,8 +37,8 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o
snd-soc-ehl-rt5660-objs := ehl_rt5660.o snd-soc-ehl-rt5660-objs := ehl_rt5660.o
snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o
snd-soc-sof-sdw-objs += sof_sdw.o \ snd-soc-sof-sdw-objs += sof_sdw.o \
sof_sdw_max98373.o \ sof_sdw_max98373.o sof_sdw_rt1308.o \
sof_sdw_rt1308.o sof_sdw_rt1316.o \ sof_sdw_rt1316.o sof_sdw_rt1318.o \
sof_sdw_rt5682.o sof_sdw_rt700.o \ sof_sdw_rt5682.o sof_sdw_rt700.o \
sof_sdw_rt711.o sof_sdw_rt711_sdca.o \ sof_sdw_rt711.o sof_sdw_rt711_sdca.o \
sof_sdw_rt715.o sof_sdw_rt715_sdca.o \ sof_sdw_rt715.o sof_sdw_rt715_sdca.o \
......
...@@ -542,6 +542,13 @@ static struct sof_sdw_codec_info codec_info_list[] = { ...@@ -542,6 +542,13 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.exit = sof_sdw_rt1316_exit, .exit = sof_sdw_rt1316_exit,
.codec_type = SOF_SDW_CODEC_TYPE_AMP, .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, .part_id = 0x714,
.version_id = 3, .version_id = 3,
......
...@@ -143,6 +143,13 @@ int sof_sdw_rt1316_init(struct snd_soc_card *card, ...@@ -143,6 +143,13 @@ int sof_sdw_rt1316_init(struct snd_soc_card *card,
bool playback); bool playback);
int sof_sdw_rt1316_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int sof_sdw_rt1316_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* 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 */ /* RT715 support */
int sof_sdw_rt715_init(struct snd_soc_card *card, int sof_sdw_rt715_init(struct snd_soc_card *card,
const struct snd_soc_acpi_link_adr *link, const struct snd_soc_acpi_link_adr *link,
......
// 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;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment