mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 15:13:52 +00:00
bb6630d153
commit717f163317
("ASoC: kirkwood: armada-370-db: 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: commit717f163317
("ASoC: kirkwood: armada-370-db: don't select unnecessary Platform") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
157 lines
4.0 KiB
C
157 lines
4.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2014 Marvell
|
|
*
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <sound/soc.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_data/asoc-kirkwood.h>
|
|
#include "../codecs/cs42l51.h"
|
|
|
|
static int a370db_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
|
unsigned int freq;
|
|
|
|
switch (params_rate(params)) {
|
|
default:
|
|
case 44100:
|
|
freq = 11289600;
|
|
break;
|
|
case 48000:
|
|
freq = 12288000;
|
|
break;
|
|
case 96000:
|
|
freq = 24576000;
|
|
break;
|
|
}
|
|
|
|
return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
|
|
}
|
|
|
|
static const struct snd_soc_ops a370db_ops = {
|
|
.hw_params = a370db_hw_params,
|
|
};
|
|
|
|
static const struct snd_soc_dapm_widget a370db_dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Out Jack", NULL),
|
|
SND_SOC_DAPM_LINE("In Jack", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route a370db_route[] = {
|
|
{ "Out Jack", NULL, "HPL" },
|
|
{ "Out Jack", NULL, "HPR" },
|
|
{ "AIN1L", NULL, "In Jack" },
|
|
{ "AIN1L", NULL, "In Jack" },
|
|
};
|
|
|
|
SND_SOC_DAILINK_DEFS(analog,
|
|
DAILINK_COMP_ARRAY(COMP_CPU("i2s")),
|
|
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")),
|
|
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
|
|
|
SND_SOC_DAILINK_DEFS(spdif_out,
|
|
DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
|
|
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")),
|
|
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
|
|
|
SND_SOC_DAILINK_DEFS(spdif_in,
|
|
DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
|
|
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")),
|
|
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
|
|
|
static struct snd_soc_dai_link a370db_dai[] = {
|
|
{
|
|
.name = "CS42L51",
|
|
.stream_name = "analog",
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
|
|
.ops = &a370db_ops,
|
|
SND_SOC_DAILINK_REG(analog),
|
|
},
|
|
{
|
|
.name = "S/PDIF out",
|
|
.stream_name = "spdif-out",
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
|
|
SND_SOC_DAILINK_REG(spdif_out),
|
|
},
|
|
{
|
|
.name = "S/PDIF in",
|
|
.stream_name = "spdif-in",
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
|
|
SND_SOC_DAILINK_REG(spdif_in),
|
|
},
|
|
};
|
|
|
|
static struct snd_soc_card a370db = {
|
|
.name = "a370db",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = a370db_dai,
|
|
.num_links = ARRAY_SIZE(a370db_dai),
|
|
.dapm_widgets = a370db_dapm_widgets,
|
|
.num_dapm_widgets = ARRAY_SIZE(a370db_dapm_widgets),
|
|
.dapm_routes = a370db_route,
|
|
.num_dapm_routes = ARRAY_SIZE(a370db_route),
|
|
};
|
|
|
|
static int a370db_probe(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = &a370db;
|
|
|
|
card->dev = &pdev->dev;
|
|
|
|
a370db_dai[0].cpus->of_node =
|
|
of_parse_phandle(pdev->dev.of_node,
|
|
"marvell,audio-controller", 0);
|
|
a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;
|
|
|
|
a370db_dai[0].codecs->of_node =
|
|
of_parse_phandle(pdev->dev.of_node,
|
|
"marvell,audio-codec", 0);
|
|
|
|
a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;
|
|
a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node;
|
|
|
|
a370db_dai[1].codecs->of_node =
|
|
of_parse_phandle(pdev->dev.of_node,
|
|
"marvell,audio-codec", 1);
|
|
|
|
a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;
|
|
a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node;
|
|
|
|
a370db_dai[2].codecs->of_node =
|
|
of_parse_phandle(pdev->dev.of_node,
|
|
"marvell,audio-codec", 2);
|
|
|
|
return devm_snd_soc_register_card(card->dev, card);
|
|
}
|
|
|
|
static const struct of_device_id a370db_dt_ids[] = {
|
|
{ .compatible = "marvell,a370db-audio" },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, a370db_dt_ids);
|
|
|
|
static struct platform_driver a370db_driver = {
|
|
.driver = {
|
|
.name = "a370db-audio",
|
|
.of_match_table = of_match_ptr(a370db_dt_ids),
|
|
},
|
|
.probe = a370db_probe,
|
|
};
|
|
|
|
module_platform_driver(a370db_driver);
|
|
|
|
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
|
|
MODULE_DESCRIPTION("ALSA SoC a370db audio client");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:a370db-audio");
|