mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ASoC: Intel: avs: rt5682: Validate machine board configuration
Allow for board to be used with TDMs. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20231012083514.492626-7-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
b124d7cc6f
commit
2172c5b90d
1 changed files with 12 additions and 6 deletions
|
@ -21,6 +21,7 @@
|
|||
#include <sound/soc-acpi.h>
|
||||
#include "../../common/soc-intel-quirks.h"
|
||||
#include "../../../codecs/rt5682.h"
|
||||
#include "../utils.h"
|
||||
|
||||
#define AVS_RT5682_SSP_CODEC(quirk) ((quirk) & GENMASK(2, 0))
|
||||
#define AVS_RT5682_SSP_CODEC_MASK (GENMASK(2, 0))
|
||||
|
@ -203,7 +204,7 @@ avs_rt5682_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_param
|
|||
}
|
||||
|
||||
static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,
|
||||
struct snd_soc_dai_link **dai_link)
|
||||
int tdm_slot, struct snd_soc_dai_link **dai_link)
|
||||
{
|
||||
struct snd_soc_dai_link_component *platform;
|
||||
struct snd_soc_dai_link *dl;
|
||||
|
@ -215,13 +216,15 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
|
|||
|
||||
platform->name = platform_name;
|
||||
|
||||
dl->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_port);
|
||||
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, "SSP%d Pin", ssp_port);
|
||||
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-10EC5682:00");
|
||||
dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, AVS_RT5682_CODEC_DAI_NAME);
|
||||
if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
|
||||
|
@ -270,7 +273,7 @@ static int avs_rt5682_probe(struct platform_device *pdev)
|
|||
struct snd_soc_jack *jack;
|
||||
struct device *dev = &pdev->dev;
|
||||
const char *pname;
|
||||
int ssp_port, ret;
|
||||
int ssp_port, tdm_slot, ret;
|
||||
|
||||
if (pdev->id_entry && pdev->id_entry->driver_data)
|
||||
avs_rt5682_quirk = (unsigned long)pdev->id_entry->driver_data;
|
||||
|
@ -280,9 +283,12 @@ static int avs_rt5682_probe(struct platform_device *pdev)
|
|||
|
||||
mach = dev_get_platdata(dev);
|
||||
pname = mach->mach_params.platform;
|
||||
ssp_port = __ffs(mach->mach_params.i2s_link_mask);
|
||||
|
||||
ret = avs_create_dai_link(dev, pname, ssp_port, &dai_link);
|
||||
ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to create dai link: %d", ret);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue