mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-09-03 17:51:23 +00:00

Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>: As discussed in user bug report [1] & [2], it was identified that HDA card provides wrong FE device numbers to be used with UCM, at the same time it was requested that we change card names to better names. This patchset does that, by adding option for going back to old behaviour in first patch. Using existing way of enumerating FEs from topology in second patch. Then setting new names in all cards while providing fallback to old name. Only exception is probe card, which is used for debug purposes only, where we just directly rename card. Do note that patch 2, will require updated topologies if topology exposes more than 1 FE on card. Old topologies didn't assign id field and it defaulted to 0, however when we use this field by setting snd_soc_component_driver::use_dai_pcm_id field, we need topologies with distinct values in FEs. Necessary changes are provided in avsdk and avs-topology-xml repositories ([4] & [5]). linux-firmware update will follow as soon as this changeset is merged. [1] Link: https://bugzilla.kernel.org/show_bug.cgi?id=219654 [2] Link: https://github.com/alsa-project/alsa-ucm-conf/pull/499 [3] Link: https://lore.kernel.org/linux-sound/20250127144445.2739017-1-amadeuszx.slawinski@linux.intel.com/ [4]a879c8ae4b
[5]9b94d52cbc
bdbc8d6ba9
137 lines
3.4 KiB
C
137 lines
3.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
//
|
|
// Copyright(c) 2021-2022 Intel Corporation
|
|
//
|
|
// Authors: Cezary Rojewski <cezary.rojewski@intel.com>
|
|
// Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
|
|
//
|
|
|
|
#include <linux/module.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/pcm_params.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-acpi.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include "../utils.h"
|
|
|
|
static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,
|
|
int tdm_slot, struct snd_soc_dai_link **dai_link)
|
|
{
|
|
struct snd_soc_dai_link_component *platform;
|
|
struct snd_soc_dai_link *dl;
|
|
|
|
dl = devm_kzalloc(dev, sizeof(*dl), GFP_KERNEL);
|
|
platform = devm_kzalloc(dev, sizeof(*platform), GFP_KERNEL);
|
|
if (!dl || !platform)
|
|
return -ENOMEM;
|
|
|
|
platform->name = platform_name;
|
|
|
|
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);
|
|
if (!dl->name || !dl->cpus)
|
|
return -ENOMEM;
|
|
|
|
dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
|
|
AVS_STRING_FMT("SSP", " Pin", ssp_port, tdm_slot));
|
|
dl->codecs = &snd_soc_dummy_dlc;
|
|
if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
|
|
return -ENOMEM;
|
|
|
|
dl->num_cpus = 1;
|
|
dl->num_codecs = 1;
|
|
dl->platforms = platform;
|
|
dl->num_platforms = 1;
|
|
dl->id = 0;
|
|
dl->nonatomic = 1;
|
|
dl->no_pcm = 1;
|
|
|
|
*dai_link = dl;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int avs_i2s_test_probe(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_dai_link *dai_link;
|
|
struct snd_soc_acpi_mach *mach;
|
|
struct avs_mach_pdata *pdata;
|
|
struct snd_soc_card *card;
|
|
struct device *dev = &pdev->dev;
|
|
const char *pname;
|
|
int ssp_port, tdm_slot, ret;
|
|
|
|
mach = dev_get_platdata(dev);
|
|
pname = mach->mach_params.platform;
|
|
pdata = mach->pdata;
|
|
|
|
if (!avs_mach_singular_ssp(mach)) {
|
|
dev_err(dev, "Invalid SSP configuration\n");
|
|
return -EINVAL;
|
|
}
|
|
ssp_port = avs_mach_ssp_port(mach);
|
|
|
|
if (!avs_mach_singular_tdm(mach, ssp_port)) {
|
|
dev_err(dev, "Invalid TDM configuration\n");
|
|
return -EINVAL;
|
|
}
|
|
tdm_slot = avs_mach_ssp_tdm(mach, ssp_port);
|
|
|
|
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
|
|
if (!card)
|
|
return -ENOMEM;
|
|
|
|
if (pdata->obsolete_card_names) {
|
|
card->name = devm_kasprintf(dev, GFP_KERNEL,
|
|
AVS_STRING_FMT("ssp", "-loopback", ssp_port, tdm_slot));
|
|
} else {
|
|
card->driver_name = "avs_i2s_test";
|
|
card->long_name = card->name = devm_kasprintf(dev, GFP_KERNEL,
|
|
AVS_STRING_FMT("AVS I2S TEST-", "",
|
|
ssp_port, tdm_slot));
|
|
}
|
|
if (!card->name)
|
|
return -ENOMEM;
|
|
|
|
ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to create dai link: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
card->dev = dev;
|
|
card->owner = THIS_MODULE;
|
|
card->dai_link = dai_link;
|
|
card->num_links = 1;
|
|
card->fully_routed = true;
|
|
|
|
ret = snd_soc_fixup_dai_links_platform_name(card, pname);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return devm_snd_soc_register_deferrable_card(dev, card);
|
|
}
|
|
|
|
static const struct platform_device_id avs_i2s_test_driver_ids[] = {
|
|
{
|
|
.name = "avs_i2s_test",
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(platform, avs_i2s_test_driver_ids);
|
|
|
|
static struct platform_driver avs_i2s_test_driver = {
|
|
.probe = avs_i2s_test_probe,
|
|
.driver = {
|
|
.name = "avs_i2s_test",
|
|
.pm = &snd_soc_pm_ops,
|
|
},
|
|
.id_table = avs_i2s_test_driver_ids,
|
|
};
|
|
|
|
module_platform_driver(avs_i2s_test_driver);
|
|
|
|
MODULE_DESCRIPTION("Intel i2s test machine driver");
|
|
MODULE_LICENSE("GPL");
|