
commit f6eb84fa596abf28959fc7e0b626f925eb1196c7 upstream. The driver_name="tegra" is now required by the newer ALSA UCMs, otherwise Tegra UCMs don't match by the path/name. All Tegra machine drivers are specifying the card's name, but it has no effect if model name is specified in the device-tree since it overrides the card's name. We need to set the driver_name to "tegra" in order to get a usable lookup path for the updated ALSA UCMs. The new UCM lookup path has a form of driver_name/card_name. The old lookup paths that are based on driver module name continue to work as before. Note that UCM matching never worked for Tegra ASoC drivers if they were compiled as built-in, this is fixed by supporting the new naming scheme. Cc: stable@vger.kernel.org Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Link: https://lore.kernel.org/r/20210529154649.25936-2-digetx@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
176 lines
4.4 KiB
C
176 lines
4.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* trimslice.c - TrimSlice machine ASoC driver
|
|
*
|
|
* Copyright (C) 2011 - CompuLab, Ltd.
|
|
* Author: Mike Rapoport <mike@compulab.co.il>
|
|
*
|
|
* Based on code copyright/by:
|
|
* Author: Stephen Warren <swarren@nvidia.com>
|
|
* Copyright (C) 2010-2011 - NVIDIA, Inc.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/jack.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/pcm_params.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "../codecs/tlv320aic23.h"
|
|
|
|
#include "tegra_asoc_utils.h"
|
|
|
|
#define DRV_NAME "tegra-snd-trimslice"
|
|
|
|
struct tegra_trimslice {
|
|
struct tegra_asoc_utils_data util_data;
|
|
};
|
|
|
|
static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
|
struct snd_soc_card *card = rtd->card;
|
|
struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
|
|
int srate, mclk;
|
|
int err;
|
|
|
|
srate = params_rate(params);
|
|
mclk = 128 * srate;
|
|
|
|
err = tegra_asoc_utils_set_rate(&trimslice->util_data, srate, mclk);
|
|
if (err < 0) {
|
|
dev_err(card->dev, "Can't configure clocks\n");
|
|
return err;
|
|
}
|
|
|
|
err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
|
|
SND_SOC_CLOCK_IN);
|
|
if (err < 0) {
|
|
dev_err(card->dev, "codec_dai clock not set\n");
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct snd_soc_ops trimslice_asoc_ops = {
|
|
.hw_params = trimslice_asoc_hw_params,
|
|
};
|
|
|
|
static const struct snd_soc_dapm_widget trimslice_dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Line Out", NULL),
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route trimslice_audio_map[] = {
|
|
{"Line Out", NULL, "LOUT"},
|
|
{"Line Out", NULL, "ROUT"},
|
|
|
|
{"LLINEIN", NULL, "Line In"},
|
|
{"RLINEIN", NULL, "Line In"},
|
|
};
|
|
|
|
SND_SOC_DAILINK_DEFS(single_dsp,
|
|
DAILINK_COMP_ARRAY(COMP_EMPTY()),
|
|
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic23-hifi")),
|
|
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
|
|
|
static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
|
|
.name = "TLV320AIC23",
|
|
.stream_name = "AIC23",
|
|
.ops = &trimslice_asoc_ops,
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S |
|
|
SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBS_CFS,
|
|
SND_SOC_DAILINK_REG(single_dsp),
|
|
};
|
|
|
|
static struct snd_soc_card snd_soc_trimslice = {
|
|
.name = "tegra-trimslice",
|
|
.driver_name = "tegra",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = &trimslice_tlv320aic23_dai,
|
|
.num_links = 1,
|
|
|
|
.dapm_widgets = trimslice_dapm_widgets,
|
|
.num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets),
|
|
.dapm_routes = trimslice_audio_map,
|
|
.num_dapm_routes = ARRAY_SIZE(trimslice_audio_map),
|
|
.fully_routed = true,
|
|
};
|
|
|
|
static int tegra_snd_trimslice_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct snd_soc_card *card = &snd_soc_trimslice;
|
|
struct tegra_trimslice *trimslice;
|
|
int ret;
|
|
|
|
trimslice = devm_kzalloc(&pdev->dev, sizeof(struct tegra_trimslice),
|
|
GFP_KERNEL);
|
|
if (!trimslice)
|
|
return -ENOMEM;
|
|
|
|
card->dev = &pdev->dev;
|
|
snd_soc_card_set_drvdata(card, trimslice);
|
|
|
|
trimslice_tlv320aic23_dai.codecs->of_node = of_parse_phandle(np,
|
|
"nvidia,audio-codec", 0);
|
|
if (!trimslice_tlv320aic23_dai.codecs->of_node) {
|
|
dev_err(&pdev->dev,
|
|
"Property 'nvidia,audio-codec' missing or invalid\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
trimslice_tlv320aic23_dai.cpus->of_node = of_parse_phandle(np,
|
|
"nvidia,i2s-controller", 0);
|
|
if (!trimslice_tlv320aic23_dai.cpus->of_node) {
|
|
dev_err(&pdev->dev,
|
|
"Property 'nvidia,i2s-controller' missing or invalid\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
trimslice_tlv320aic23_dai.platforms->of_node =
|
|
trimslice_tlv320aic23_dai.cpus->of_node;
|
|
|
|
ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = devm_snd_soc_register_card(&pdev->dev, card);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id trimslice_of_match[] = {
|
|
{ .compatible = "nvidia,tegra-audio-trimslice", },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, trimslice_of_match);
|
|
|
|
static struct platform_driver tegra_snd_trimslice_driver = {
|
|
.driver = {
|
|
.name = DRV_NAME,
|
|
.of_match_table = trimslice_of_match,
|
|
},
|
|
.probe = tegra_snd_trimslice_probe,
|
|
};
|
|
module_platform_driver(tegra_snd_trimslice_driver);
|
|
|
|
MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
|
|
MODULE_DESCRIPTION("Trimslice machine ASoC driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:" DRV_NAME);
|