ASoC: simple-scu-card: remove simple-scu-card
It is already merged into simple-card. simple-scu-card is no longer needed. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>hifive-unleashed-5.1
Kuninori Morimoto
Mark Brown
parent
bb93487b85
commit
c8ed6aca6b
|
|
@ -8,14 +8,6 @@ config SND_SIMPLE_CARD
|
|||
This option enables generic simple sound card support
|
||||
It also support DPCM of multi CPU single Codec ststem.
|
||||
|
||||
config SND_SIMPLE_SCU_CARD
|
||||
tristate "ASoC Simple SCU sound card support"
|
||||
depends on OF
|
||||
select SND_SIMPLE_CARD_UTILS
|
||||
help
|
||||
This option enables generic simple SCU sound card support.
|
||||
It supports DPCM of multi CPU single Codec system.
|
||||
|
||||
config SND_AUDIO_GRAPH_CARD
|
||||
tristate "ASoC Audio Graph sound card support"
|
||||
depends on OF
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
snd-soc-simple-card-utils-objs := simple-card-utils.o
|
||||
snd-soc-simple-card-objs := simple-card.o
|
||||
snd-soc-simple-scu-card-objs := simple-scu-card.o
|
||||
snd-soc-audio-graph-card-objs := audio-graph-card.o
|
||||
|
||||
obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o
|
||||
obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o
|
||||
obj-$(CONFIG_SND_SIMPLE_SCU_CARD) += snd-soc-simple-scu-card.o
|
||||
obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o
|
||||
|
|
|
|||
|
|
@ -1,474 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
//
|
||||
// ASoC simple SCU sound card support
|
||||
//
|
||||
// Copyright (C) 2015 Renesas Solutions Corp.
|
||||
// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
||||
//
|
||||
// based on ${LINUX}/sound/soc/generic/simple-card.c
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/string.h>
|
||||
#include <sound/jack.h>
|
||||
#include <sound/soc.h>
|
||||
#include <sound/soc-dai.h>
|
||||
#include <sound/simple_card_utils.h>
|
||||
|
||||
struct simple_card_data {
|
||||
struct snd_soc_card snd_card;
|
||||
struct simple_dai_props {
|
||||
struct asoc_simple_dai *cpu_dai;
|
||||
struct asoc_simple_dai *codec_dai;
|
||||
struct snd_soc_dai_link_component codecs;
|
||||
struct snd_soc_dai_link_component platform;
|
||||
struct asoc_simple_card_data adata;
|
||||
struct snd_soc_codec_conf *codec_conf;
|
||||
} *dai_props;
|
||||
struct snd_soc_dai_link *dai_link;
|
||||
struct asoc_simple_dai *dais;
|
||||
struct asoc_simple_card_data adata;
|
||||
struct snd_soc_codec_conf *codec_conf;
|
||||
};
|
||||
|
||||
#define simple_priv_to_card(priv) (&(priv)->snd_card)
|
||||
#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))
|
||||
#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev)
|
||||
#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i))
|
||||
|
||||
#define DAI "sound-dai"
|
||||
#define CELL "#sound-dai-cells"
|
||||
#define PREFIX "simple-audio-card,"
|
||||
|
||||
static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct simple_dai_props *dai_props =
|
||||
simple_priv_to_props(priv, rtd->num);
|
||||
int ret;
|
||||
|
||||
ret = asoc_simple_card_clk_enable(dai_props->cpu_dai);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_clk_enable(dai_props->codec_dai);
|
||||
if (ret)
|
||||
asoc_simple_card_clk_disable(dai_props->cpu_dai);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct simple_dai_props *dai_props =
|
||||
simple_priv_to_props(priv, rtd->num);
|
||||
|
||||
asoc_simple_card_clk_disable(dai_props->cpu_dai);
|
||||
|
||||
asoc_simple_card_clk_disable(dai_props->codec_dai);
|
||||
}
|
||||
|
||||
static const struct snd_soc_ops asoc_simple_card_ops = {
|
||||
.startup = asoc_simple_card_startup,
|
||||
.shutdown = asoc_simple_card_shutdown,
|
||||
};
|
||||
|
||||
static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
|
||||
int ret;
|
||||
|
||||
ret = asoc_simple_card_init_dai(rtd->codec_dai,
|
||||
dai_props->codec_dai);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_init_dai(rtd->cpu_dai,
|
||||
dai_props->cpu_dai);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
|
||||
|
||||
asoc_simple_card_convert_fixup(&dai_props->adata, params);
|
||||
|
||||
/* overwrite by top level adata if exist */
|
||||
asoc_simple_card_convert_fixup(&priv->adata, params);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int asoc_simple_card_dai_link_of(struct device_node *link,
|
||||
struct device_node *np,
|
||||
struct device_node *codec,
|
||||
struct simple_card_data *priv,
|
||||
int *dai_idx, int link_idx,
|
||||
int *conf_idx, int is_fe,
|
||||
bool is_top_level_node)
|
||||
{
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, link_idx);
|
||||
struct simple_dai_props *dai_props = simple_priv_to_props(priv, link_idx);
|
||||
struct snd_soc_card *card = simple_priv_to_card(priv);
|
||||
struct asoc_simple_dai *dai;
|
||||
char *prefix = "";
|
||||
int ret;
|
||||
|
||||
/* For single DAI link & old style of DT node */
|
||||
if (is_top_level_node)
|
||||
prefix = PREFIX;
|
||||
|
||||
if (is_fe) {
|
||||
int is_single_links = 0;
|
||||
struct snd_soc_dai_link_component *codecs;
|
||||
|
||||
/* BE is dummy */
|
||||
codecs = dai_link->codecs;
|
||||
codecs->of_node = NULL;
|
||||
codecs->dai_name = "snd-soc-dummy-dai";
|
||||
codecs->name = "snd-soc-dummy";
|
||||
|
||||
/* FE settings */
|
||||
dai_link->dynamic = 1;
|
||||
dai_link->dpcm_merged_format = 1;
|
||||
|
||||
dai =
|
||||
dai_props->cpu_dai = &priv->dais[(*dai_idx)++];
|
||||
|
||||
ret = asoc_simple_card_parse_cpu(np, dai_link, DAI, CELL,
|
||||
&is_single_links);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_set_dailink_name(dev, dai_link,
|
||||
"fe.%s",
|
||||
dai_link->cpu_dai_name);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
asoc_simple_card_canonicalize_cpu(dai_link, is_single_links);
|
||||
} else {
|
||||
struct snd_soc_codec_conf *cconf;
|
||||
|
||||
/* FE is dummy */
|
||||
dai_link->cpu_of_node = NULL;
|
||||
dai_link->cpu_dai_name = "snd-soc-dummy-dai";
|
||||
dai_link->cpu_name = "snd-soc-dummy";
|
||||
|
||||
/* BE settings */
|
||||
dai_link->no_pcm = 1;
|
||||
dai_link->be_hw_params_fixup = asoc_simple_card_be_hw_params_fixup;
|
||||
|
||||
dai =
|
||||
dai_props->codec_dai = &priv->dais[(*dai_idx)++];
|
||||
|
||||
cconf =
|
||||
dai_props->codec_conf = &priv->codec_conf[(*conf_idx)++];
|
||||
|
||||
ret = asoc_simple_card_parse_codec(np, dai_link, DAI, CELL);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_set_dailink_name(dev, dai_link,
|
||||
"be.%s",
|
||||
dai_link->codecs->dai_name);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* check "prefix" from top node */
|
||||
snd_soc_of_parse_audio_prefix(card, cconf,
|
||||
dai_link->codecs->of_node,
|
||||
PREFIX "prefix");
|
||||
/* check "prefix" from each node if top doesn't have */
|
||||
if (!cconf->of_node)
|
||||
snd_soc_of_parse_node_prefix(np, cconf,
|
||||
dai_link->codecs->of_node,
|
||||
"prefix");
|
||||
}
|
||||
|
||||
asoc_simple_card_parse_convert(dev, link, prefix, &dai_props->adata);
|
||||
|
||||
ret = asoc_simple_card_of_parse_tdm(np, dai);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_canonicalize_dailink(dai_link);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_parse_daifmt(dev, link, codec,
|
||||
prefix, &dai_link->dai_fmt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
dai_link->dpcm_playback = 1;
|
||||
dai_link->dpcm_capture = 1;
|
||||
dai_link->ops = &asoc_simple_card_ops;
|
||||
dai_link->init = asoc_simple_card_dai_init;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int asoc_simple_card_parse_of(struct simple_card_data *priv)
|
||||
|
||||
{
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
struct device_node *top = dev->of_node;
|
||||
struct device_node *node;
|
||||
struct device_node *np;
|
||||
struct device_node *codec;
|
||||
struct snd_soc_card *card = simple_priv_to_card(priv);
|
||||
bool is_fe;
|
||||
int ret, loop;
|
||||
int dai_idx, link_idx, conf_idx;
|
||||
|
||||
if (!top)
|
||||
return -EINVAL;
|
||||
|
||||
ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = asoc_simple_card_of_parse_routing(card, PREFIX);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
asoc_simple_card_parse_convert(dev, top, PREFIX, &priv->adata);
|
||||
|
||||
loop = 1;
|
||||
link_idx = 0;
|
||||
dai_idx = 0;
|
||||
conf_idx = 0;
|
||||
node = of_get_child_by_name(top, PREFIX "dai-link");
|
||||
if (!node) {
|
||||
node = dev->of_node;
|
||||
loop = 0;
|
||||
}
|
||||
|
||||
do {
|
||||
codec = of_get_child_by_name(node,
|
||||
loop ? "codec" : PREFIX "codec");
|
||||
if (!codec)
|
||||
return -ENODEV;
|
||||
|
||||
for_each_child_of_node(node, np) {
|
||||
is_fe = (np != codec);
|
||||
|
||||
ret = asoc_simple_card_dai_link_of(node, np, codec, priv,
|
||||
&dai_idx, link_idx++,
|
||||
&conf_idx,
|
||||
is_fe, !loop);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
node = of_get_next_child(top, node);
|
||||
} while (loop && node);
|
||||
|
||||
ret = asoc_simple_card_parse_card_name(card, PREFIX);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void asoc_simple_card_get_dais_count(struct device *dev,
|
||||
int *link_num,
|
||||
int *dais_num,
|
||||
int *ccnf_num)
|
||||
{
|
||||
struct device_node *top = dev->of_node;
|
||||
struct device_node *node;
|
||||
int loop;
|
||||
int num;
|
||||
|
||||
/*
|
||||
* link_num : number of links.
|
||||
* CPU-Codec / CPU-dummy / dummy-Codec
|
||||
* dais_num : number of DAIs
|
||||
* ccnf_num : number of codec_conf
|
||||
* same number for "dummy-Codec"
|
||||
*
|
||||
* ex1)
|
||||
* CPU0 --- Codec0 link : 5
|
||||
* CPU1 --- Codec1 dais : 7
|
||||
* CPU2 -/ ccnf : 1
|
||||
* CPU3 --- Codec2
|
||||
*
|
||||
* => 5 links = 2xCPU-Codec + 2xCPU-dummy + 1xdummy-Codec
|
||||
* => 7 DAIs = 4xCPU + 3xCodec
|
||||
* => 1 ccnf = 1xdummy-Codec
|
||||
*
|
||||
* ex2)
|
||||
* CPU0 --- Codec0 link : 5
|
||||
* CPU1 --- Codec1 dais : 6
|
||||
* CPU2 -/ ccnf : 1
|
||||
* CPU3 -/
|
||||
*
|
||||
* => 5 links = 1xCPU-Codec + 3xCPU-dummy + 1xdummy-Codec
|
||||
* => 6 DAIs = 4xCPU + 2xCodec
|
||||
* => 1 ccnf = 1xdummy-Codec
|
||||
*
|
||||
* ex3)
|
||||
* CPU0 --- Codec0 link : 6
|
||||
* CPU1 -/ dais : 6
|
||||
* CPU2 --- Codec1 ccnf : 2
|
||||
* CPU3 -/
|
||||
*
|
||||
* => 6 links = 0xCPU-Codec + 4xCPU-dummy + 2xdummy-Codec
|
||||
* => 6 DAIs = 4xCPU + 2xCodec
|
||||
* => 2 ccnf = 2xdummy-Codec
|
||||
*/
|
||||
if (!top) {
|
||||
(*link_num) = 1;
|
||||
(*dais_num) = 2;
|
||||
(*ccnf_num) = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
loop = 1;
|
||||
node = of_get_child_by_name(top, PREFIX "dai-link");
|
||||
if (!node) {
|
||||
node = top;
|
||||
loop = 0;
|
||||
}
|
||||
|
||||
do {
|
||||
num = of_get_child_count(node);
|
||||
(*dais_num) += num;
|
||||
if (num > 2) {
|
||||
(*link_num) += num;
|
||||
(*ccnf_num)++;
|
||||
} else {
|
||||
(*link_num)++;
|
||||
}
|
||||
node = of_get_next_child(top, node);
|
||||
} while (loop && node);
|
||||
}
|
||||
|
||||
static int asoc_simple_card_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct simple_card_data *priv;
|
||||
struct snd_soc_dai_link *dai_link;
|
||||
struct simple_dai_props *dai_props;
|
||||
struct asoc_simple_dai *dais;
|
||||
struct snd_soc_card *card;
|
||||
struct snd_soc_codec_conf *cconf;
|
||||
struct device *dev = &pdev->dev;
|
||||
int ret, i;
|
||||
int lnum = 0, dnum = 0, cnum = 0;
|
||||
|
||||
/* Allocate the private data */
|
||||
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||
if (!priv)
|
||||
return -ENOMEM;
|
||||
|
||||
asoc_simple_card_get_dais_count(dev, &lnum, &dnum, &cnum);
|
||||
if (!lnum || !dnum)
|
||||
return -EINVAL;
|
||||
|
||||
dai_props = devm_kcalloc(dev, lnum, sizeof(*dai_props), GFP_KERNEL);
|
||||
dai_link = devm_kcalloc(dev, lnum, sizeof(*dai_link), GFP_KERNEL);
|
||||
dais = devm_kcalloc(dev, dnum, sizeof(*dais), GFP_KERNEL);
|
||||
cconf = devm_kcalloc(dev, cnum, sizeof(*cconf), GFP_KERNEL);
|
||||
if (!dai_props || !dai_link || !dais)
|
||||
return -ENOMEM;
|
||||
|
||||
/*
|
||||
* Use snd_soc_dai_link_component instead of legacy style
|
||||
* It is codec only. but cpu/platform will be supported in the future.
|
||||
* see
|
||||
* soc-core.c :: snd_soc_init_multicodec()
|
||||
*/
|
||||
for (i = 0; i < lnum; i++) {
|
||||
dai_link[i].codecs = &dai_props[i].codecs;
|
||||
dai_link[i].num_codecs = 1;
|
||||
dai_link[i].platform = &dai_props[i].platform;
|
||||
}
|
||||
|
||||
priv->dai_props = dai_props;
|
||||
priv->dai_link = dai_link;
|
||||
priv->dais = dais;
|
||||
priv->codec_conf = cconf;
|
||||
|
||||
/* Init snd_soc_card */
|
||||
card = simple_priv_to_card(priv);
|
||||
card->owner = THIS_MODULE;
|
||||
card->dev = dev;
|
||||
card->dai_link = priv->dai_link;
|
||||
card->num_links = lnum;
|
||||
card->codec_conf = cconf;
|
||||
card->num_configs = cnum;
|
||||
|
||||
ret = asoc_simple_card_parse_of(priv);
|
||||
if (ret < 0) {
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dev, "parse error %d\n", ret);
|
||||
goto err;
|
||||
}
|
||||
|
||||
snd_soc_card_set_drvdata(card, priv);
|
||||
|
||||
ret = devm_snd_soc_register_card(dev, card);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
return 0;
|
||||
err:
|
||||
asoc_simple_card_clean_reference(card);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int asoc_simple_card_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
return asoc_simple_card_clean_reference(card);
|
||||
}
|
||||
|
||||
static const struct of_device_id asoc_simple_of_match[] = {
|
||||
{ .compatible = "renesas,rsrc-card", },
|
||||
{ .compatible = "simple-scu-audio-card", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
|
||||
|
||||
static struct platform_driver asoc_simple_card = {
|
||||
.driver = {
|
||||
.name = "simple-scu-audio-card",
|
||||
.pm = &snd_soc_pm_ops,
|
||||
.of_match_table = asoc_simple_of_match,
|
||||
},
|
||||
.probe = asoc_simple_card_probe,
|
||||
.remove = asoc_simple_card_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(asoc_simple_card);
|
||||
|
||||
MODULE_ALIAS("platform:asoc-simple-scu-card");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_DESCRIPTION("ASoC Simple SCU Sound Card");
|
||||
MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
|
||||
Loading…
Reference in New Issue