mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
9e8f5299c9
commit014f07ca1c("ASoC: fsl: imx-spdif: don't select unnecessary Platform") Current ALSA SoC avoid to add duplicate component to rtd, and this driver was selecting CPU component as Platform component. Thus, above patch removed Platform settings from this driver, because it assumed these are same component. But, some CPU driver is using generic DMAEngine, in such case, both CPU component and Platform component will have same of_node/name. In other words, there are some components which are different but have same of_node/name. In such case, Card driver definitely need to select Platform even though it is same as CPU. It is depends on CPU driver, but is difficult to know it from Card driver. This patch reverts above patch. Fixes: commit014f07ca1c("ASoC: fsl: imx-spdif: don't select unnecessary Platform") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
102 lines
2.5 KiB
C
102 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
//
|
|
// Copyright (C) 2013 Freescale Semiconductor, Inc.
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/of_platform.h>
|
|
#include <sound/soc.h>
|
|
|
|
struct imx_spdif_data {
|
|
struct snd_soc_dai_link dai;
|
|
struct snd_soc_card card;
|
|
};
|
|
|
|
static int imx_spdif_audio_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *spdif_np, *np = pdev->dev.of_node;
|
|
struct imx_spdif_data *data;
|
|
struct snd_soc_dai_link_component *comp;
|
|
int ret = 0;
|
|
|
|
spdif_np = of_parse_phandle(np, "spdif-controller", 0);
|
|
if (!spdif_np) {
|
|
dev_err(&pdev->dev, "failed to find spdif-controller\n");
|
|
ret = -EINVAL;
|
|
goto end;
|
|
}
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
|
|
if (!data || !comp) {
|
|
ret = -ENOMEM;
|
|
goto end;
|
|
}
|
|
|
|
data->dai.cpus = &comp[0];
|
|
data->dai.codecs = &comp[1];
|
|
data->dai.platforms = &comp[2];
|
|
|
|
data->dai.num_cpus = 1;
|
|
data->dai.num_codecs = 1;
|
|
data->dai.num_platforms = 1;
|
|
|
|
data->dai.name = "S/PDIF PCM";
|
|
data->dai.stream_name = "S/PDIF PCM";
|
|
data->dai.codecs->dai_name = "snd-soc-dummy-dai";
|
|
data->dai.codecs->name = "snd-soc-dummy";
|
|
data->dai.cpus->of_node = spdif_np;
|
|
data->dai.platforms->of_node = spdif_np;
|
|
data->dai.playback_only = true;
|
|
data->dai.capture_only = true;
|
|
|
|
if (of_property_read_bool(np, "spdif-out"))
|
|
data->dai.capture_only = false;
|
|
|
|
if (of_property_read_bool(np, "spdif-in"))
|
|
data->dai.playback_only = false;
|
|
|
|
if (data->dai.playback_only && data->dai.capture_only) {
|
|
dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n");
|
|
goto end;
|
|
}
|
|
|
|
data->card.dev = &pdev->dev;
|
|
data->card.dai_link = &data->dai;
|
|
data->card.num_links = 1;
|
|
data->card.owner = THIS_MODULE;
|
|
|
|
ret = snd_soc_of_parse_card_name(&data->card, "model");
|
|
if (ret)
|
|
goto end;
|
|
|
|
ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
|
|
if (ret && ret != -EPROBE_DEFER)
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
|
|
|
|
end:
|
|
of_node_put(spdif_np);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const struct of_device_id imx_spdif_dt_ids[] = {
|
|
{ .compatible = "fsl,imx-audio-spdif", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, imx_spdif_dt_ids);
|
|
|
|
static struct platform_driver imx_spdif_driver = {
|
|
.driver = {
|
|
.name = "imx-spdif",
|
|
.pm = &snd_soc_pm_ops,
|
|
.of_match_table = imx_spdif_dt_ids,
|
|
},
|
|
.probe = imx_spdif_audio_probe,
|
|
};
|
|
|
|
module_platform_driver(imx_spdif_driver);
|
|
|
|
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
|
MODULE_DESCRIPTION("Freescale i.MX S/PDIF machine driver");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS("platform:imx-spdif");
|